compile librump/compat.o failed on amd64

[KS <ks%ub.uni-mainz.de@localhost>]

Hi,

after cvs updateing -current some minutes ago, build.sh ... distribution
for amd64 fails:

    compile  librump/compat.o
In file included from ./i386/pmap.h:80,
                 from ./machine/pmap.h:348,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../uvm/uvm_pmap.h:92,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../uvm/uvm_extern.h:480,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../sys/vnode.h:73,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/librump/rumpkern/compat.c:40:
./i386/pte.h:188: error: conflicting types for 'pd_entry_t'
./machine/pte.h:71: error: previous declaration of 'pd_entry_t' was here
./i386/pte.h:189: error: conflicting types for 'pt_entry_t'
./machine/pte.h:72: error: previous declaration of 'pt_entry_t' was here
In file included from ./i386/pmap.h:80,
                 from ./machine/pmap.h:348,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../uvm/uvm_pmap.h:92,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../uvm/uvm_extern.h:480,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../sys/vnode.h:73,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/librump/rumpkern/compat.c:40:
./i386/pte.h:225:1: error: "L2_SHIFT" redefined
In file included from ./x86/cpu.h:53,
                 from ./i386/cpu.h:40,
                 from ./machine/cpu.h:96,
                 from ./i386/param.h:45,
                 from ./machine/param.h:127,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/../sys/param.h:164,
                 from 
/u/NetBSD/src/lib/librump/../../sys/rump/librump/rumpkern/compat.c:35:
./machine/pte.h:81:1: error: this is the location of the previous definition

and so on and so on...


Kurt