tip build problem on powerpc

Hi all,

Last night's build of tip/master on powerpc produced these errors:

kernel/nmi_watchdog.c:33: error: redefinition of 'touch_nmi_watchdog'
kernel/nmi_watchdog.c:59: error: 'nmi_watchdog_enabled' undeclared (first use in this function)
kernel/nmi_watchdog.c:59: error: (Each undeclared identifier is reported only once
kernel/nmi_watchdog.c:59: error: for each function it appears in.)
kernel/nmi_watchdog.c:109: error: implicit declaration of function 'die_nmi'
kernel/nmi_watchdog.c:136: error: 'cpu_khz' undeclared (first use in this function)

This was from the powerpc pseries_defconfig build (as well as the
pamc32_defconfig, ppc6xx_defconfig and ppc64_defconfig builds).  Caused
by commit 1fb9d6ad2766a1dd70d167552988375049a97f21 ("nmi_watchdog: Add
new, generic implementation, using perf events") but exposed by commit
84e478c6f1eb9c4bfa1fff2f8108e9a061b46428 ("nmi_watchdog: Config option to
enable new nmi_watchdog").

Full logs, configs: http://kisskb.ellerman.id.au/kisskb/branch/12/
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/