Breakage in tree

I saw that Niklas committed a bunch of stuff so I tried to give the SMP  
branch a twirl. It didn't compile though. There is a warning and an  
error in locore.s. I am using -current (as of Saturday morning CST)  
including userland.

Line 1843 should be
movl	P_MD_TSS_SEL(%ebx),%edx
instead of
movl	P_MD_TSS_SEL(%ebx),%dx

Didn't have time to figure out the error (I'll try again later if no  
one beats me to it). Anyway here is the output.
[root@devbox GENERIC]# make
cc -x assembler-with-cpp -traditional-cpp -D_LOCORE -nostdinc -I.  
-I/usr/src/smp/src/sys/arch/i386/compile/GENERIC/../../../../arch  
-I/usr/src/smp/src/sys/arch/i386/compile/GENERIC/../../../.. -DDDB  
-DDIAGNOSTIC -DKTRACE -DKMEMSTATS -DPTRACE -DCRYPTO -DSYSVMSG -DSYSVSEM  
-DSYSVSHM -DUVM_SWAP_ENCRYPT -DCOMPAT_25 -DCOMPAT_43 -DLKM -DFFS  
-DFFS_SOFTUPDATES -DUFS_DIRHASH -DQUOTA -DEXT2FS -DMFS -DXFS -DTCP_SACK  
-DTCP_ECN -DTCP_SIGNATURE -DNFSCLIENT -DNFSSERVER -DCD9660 -DMSDOSFS  
-DFDESC -DFIFO -DKERNFS -DPORTAL -DPROCFS -DNULLFS -DUMAPFS -DUNION  
-DINET -DALTQ -DINET6 -DIPSEC -DPPP_BSDCOMP -DPPP_DEFLATE -DBOOT_CONFIG  
-DI386_CPU -DI486_CPU -DI586_CPU -DI686_CPU -DGPL_MATH_EMULATE  
-DUSER_PCICONF -DUSER_LDT -DAPERTURE -DCOMPAT_SVR4 -DCOMPAT_IBCS2  
-DCOMPAT_LINUX -DCOMPAT_FREEBSD -DCOMPAT_BSDOS -DCOMPAT_AOUT  
-DPCIVERBOSE -DEISAVERBOSE -DUSBVERBOSE -DWSDISPLAY_COMPAT_USL  
-DWSDISPLAY_COMPAT_RAWKBD -DWSDISPLAY_DEFAULTSCREENS="6"  
-DWSDISPLAY_COMPAT_PCVT -DPCIAGP -D_KERNEL -Di386 -c  
/usr/src/smp/src/sys/arch/i386/compile/GENERIC/../../../../arch/i386/ 
i386/locore.s
/tmp//cca30153.s: Assembler messages:
/tmp//cca30153.s:6037: Warning: using `%edx' instead of `%dx' due to  
`l' suffix
/tmp//cca30153.s:6829: Error: no such instruction: `astpending'
*** Error code 1

Stop in /usr/src/smp/src/sys/arch/i386/compile/GENERIC (line 732 of  
Makefile).