MULTIPROCESSOR macppc kernel won't link

I'm trying to compile a MULTIPROCESSOR macppc kernel,
-current as of
July 3, and the link fails with:

locore.o: In function `cpu_spinup_trampoline':
/usr/src.local/sys/arch/macppc/macppc/locore.S:(.text+0xb4):
undefined reference to `sched_lock_idle'
/usr/src.local/sys/arch/macppc/macppc/locore.S:(.text+0xbc):
undefined reference to `Idle'
locore.o: In function `cpu_lwp_bootstrap':
/usr/src.local/sys/arch/macppc/macppc/locore.S:(.text+0x3e4)
: undefined reference to `proc_trampoline_mp'

*** Failed target:  netbsd

It looks like those routines were removed as part of the
idlelwp merge,
but I have no idea what the calls to those routines should
be replaced
with. Any thoughts?
-- 
Name: Dave Huang         |  Mammal, mammal / their names are
called /
INet: khymazeotrope.org |  they raise a paw / the bat, the cat
/
FurryMUCK: Dahan         |  dolphin and dog / koala bear and
hog -- TMBG
Dahan: Hani G Y+C 31 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F-
Q+++ P+ B+ PA+ PL++