Build failure on amd64 - NACPICA related?

[Paul Goyette <paul%whooppee.com@localhost>]

With up-to-date sources I'm getting

#   compile  INSTALL_XEN3_DOMU/machdep.o
/build/netbsd-local/tools/x86_64/amd64/bin/x86_64--netbsd-gcc -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mno-fp-ret-in-387 -ffreestanding -fno-zero-initialized-in-bss -g -O2 -fno-omit-frame-pointer -fstack-protector -Wstack-protector --param ssp-buffer-size=1 -fno-strict-aliasing -fno-common -std=gnu99 -Werror -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign -Wno-attributes -Wextra -Wno-unused-parameter -Wold-style-definition -Wno-sign-compare --sysroot=/build/netbsd-local/dest/amd64 -Damd64 -Dx86_64 -I. -I/build/netbsd-local/obj/amd64/sys/arch/amd64/compile/INSTALL_XEN3_DOMU/xen-ma -I/build/netbsd-local/src/sys/external/bsd/acpica/dist -I/build/netbsd-local/src/sys/../common/lib/libx86emu -I/build/netbsd-local/src/sys/../common/include -I/build/netbsd-local/src/sys/arch -I/build/netbsd-local/src/sys -nostdinc -DMAXPHYS=32768 -DDIAGNOSTIC -DSYSMON_POWER -DSYSMON_ENVSYS -DSYSMON_WDOG -DSYSMON_TASKQ -D_KERNEL -D_KERNEL_OPT -std=gnu99 -I/build/netbsd-local/src/sys/lib/libkern/../../../common/lib/libc/quad -I/build/netbsd-local/src/sys/lib/libkern/../../../common/lib/libc/string -I/build/netbsd-local/src/sys/lib/libkern/../../../common/lib/libc/arch/x86_64/string -D_FORTIFY_SOURCE=2 -I/build/netbsd-local/src/sys/external/bsd/ipf -c /build/netbsd-local/src/sys/arch/amd64/amd64/machdep.c -o machdep.o
/build/netbsd-local/src/sys/arch/amd64/amd64/machdep.c: In function 'init_x86_64':
/build/netbsd-local/src/sys/arch/amd64/amd64/machdep.c:1643:17: error: 'local_apic_va' undeclared (first use in this function)
  pmap_kenter_pa(local_apic_va, local_apic_pa,
                 ^
/build/netbsd-local/src/sys/arch/amd64/amd64/machdep.c:1643:17: note: each undeclared identifier is reported only once for each function it appears in
*** [machdep.o] Error code 1

+------------------+--------------------------+------------------------+
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:      |
| (Retired)        | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+------------------+--------------------------+------------------------+