Andrew,

there is a slight incompatibilty between the vmlocking branch code and 
the last drm code update. See below:


#   compile  PRESARIO/ati_pcigart.o
cc -march=pentium4m -msse2 -mfpmath=sse -ffreestanding 
-fno-zero-initialized-in-bss -march=pentium4m -O2 -Werror -Wall 
-Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes 
-Wstrict-prototypes -Wswitch -Wshadow -Wcast-qual -Wwrite-strings 
-Wno-sign-compare -Wno-pointer-sign -Wno-attributes -Wextra 
-Wno-unused-parameter -fno-strict-aliasing -Di386 -I. 
-I../../../../contrib/dev/ath/netbsd -I../../../../../common/include 
-I../../../../arch -I../../../.. -nostdinc -DDFLDSIZ=805306368 -DLKM 
-DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT 
-I../../../../lib/libkern/../../../common/lib/libc/quad 
-I../../../../lib/libkern/../../../common/lib/libc/string 
-I../../../../lib/libkern/../../../common/lib/libc/arch/i386/string 
-I../../../../dist/ipf -c ../../../../dev/pci/drm/ati_pcigart.c
In file included from ../../../../dev/pci/drm/ati_pcigart.c:37:
../../../../dev/drm/drmP.h:229: error: expected identifier or '(' before 
'<<' token
In file included from ../../../../dev/pci/drm/ati_pcigart.c:37:
../../../../dev/drm/drmP.h:238:1: error: "DRM_SPINTYPE" redefined
../../../../dev/drm/drmP.h:230:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:239:1: error: "DRM_SPININIT" redefined
../../../../dev/drm/drmP.h:231:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:240:1: error: "DRM_SPINUNINIT" redefined
../../../../dev/drm/drmP.h:232:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:241:1: error: "DRM_SPINLOCK" redefined
../../../../dev/drm/drmP.h:233:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:242:1: error: "DRM_SPINUNLOCK" redefined
../../../../dev/drm/drmP.h:234:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:243:1: error: "DRM_SPINLOCK_ASSERT" redefined
../../../../dev/drm/drmP.h:235:1: error: this is the location of the 
previous definition
../../../../dev/drm/drmP.h:244:9: error: too many decimal points in number
../../../../dev/drm/drmP.h:752: error: expected specifier-qualifier-list 
before 'irqreturn_t'
../../../../dev/drm/drmP.h:1003: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'drm_irq_handler'
*** Error code 1

I'll try to figure what's wrong, does not seem to be unfathomable ;)

Cheers,
Vincent