5.4 -> 6.0 buildworld failure

[Markus Buretorp]

Hello,

I'm trying to upgrade from FreeBSD 5.4-STABLE to 6.0. I've done a cvsup 
to RELENG_6 and RELENG_6_0, I've ran make cleanworld, make clean, rm -rf 
/usr/obj/*, etc; but nothing helps.

This is the error

    cc -O2 -pipe -march=athlon-xp -DLIBC_SCCS -I/usr/src/lib/libkvm  -c
    /usr/src/lib/libkvm/kvm_getloadavg.c
    cc -O2 -pipe -march=athlon-xp -DLIBC_SCCS -I/usr/src/lib/libkvm  -c
    /usr/src/lib/libkvm/kvm_getswapinfo.c
    cc -O2 -pipe -march=athlon-xp -DLIBC_SCCS -I/usr/src/lib/libkvm  -c
    /usr/src/lib/libkvm/kvm_proc.c
    /usr/src/lib/libkvm/kvm_proc.c: In function `kvm_proclist':
    /usr/src/lib/libkvm/kvm_proc.c:108: error: storage size of 't_cdev'
    isn't known
    /usr/src/lib/libkvm/kvm_proc.c:114: error: storage size of 'pr'
    isn't known
    /usr/src/lib/libkvm/kvm_proc.c:176: error: structure has no member
    named `ki_jid'
    /usr/src/lib/libkvm/kvm_proc.c:377: error: structure has no member
    named `p_rux'
    *** Error code 1

    Stop in /usr/src/lib/libkvm.
    *** Error code 1

    Stop in /usr/src.
    *** Error code 1

    Stop in /usr/src.
    *** Error code 1

    Stop in /usr/src.
    *** Error code 1

    Stop in /usr/src.

Some info

    FreeBSD jmb.mine.nu 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon Aug 15
    21:16:37 CEST 2005    
    sunray at jmb.mine.nu:/usr/obj/usr/src/sys/GENERIC  i386


Regards,
Markus