Build broken for port-amd64

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

With sources updated just minutes ago,

/build/netbsd-local/src/sys/arch/x86/x86/cpu.c:191:31: error: 'MP_TRAMPOLINE' 
undeclared here (not in a function)
/build/netbsd-local/src/sys/arch/x86/x86/cpu.c: In function 'cpu_attach':
/build/netbsd-local/src/sys/arch/x86/x86/cpu.c:458:6: error: 'mp_verbose' 
undeclared (first use in this function)
/build/netbsd-local/src/sys/arch/x86/x86/cpu.c:458:6: note: each undeclared 
identifier is reported only once for each function it appears in
*** [cpu.o] Error code 1


I suspect the following commit:

Module Name:    src
Committed By:   kiyohara
Date:           Sat Dec  8 12:36:31 UTC 2012

Modified Files:
        src/sys/arch/i386/i386: db_interface.c trap.c
        src/sys/arch/x86/x86: bus_dma.c cpu.c platform.c

Log Message:
#ifdef - #endif-ed. NMCA, NISA, NNPX, NIOAPIC, LAPIC, MPBIOS and 
MULTIPROCESSOR.



-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------