Change: config ARCH_SETS_UP_PER_CPU_AREA to: config HAVE_SETUP_PER_CPU_AREA Based on latest linux-2.6.git Cc: Andi Kleen Cc: Tony Luck Cc: David Miller Cc: Sam Ravnborg Cc: Rusty Russell Cc: Geert Uytterhoeven Cc: linuxppc-dev@ozlabs.org Cc: linux-ia64@vger.kernel.org Signed-off-by: Mike Travis --- linux-2.6.git: - added back in missing pieces from x86.git merge The change to using "select xxx" as suggested by Sam requires an addition to a non-existant file (arch/Kconfig) so I went back to using "config xxx" to introduce the flag. --- arch/ia64/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/sparc64/Kconfig | 2 +- init/main.c | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL bool default y -config ARCH_SETS_UP_PER_CPU_AREA +config HAVE_SETUP_PER_CPU_AREA def_bool y config DMI --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS bool default y -config ARCH_SETS_UP_PER_CPU_AREA +config HAVE_SETUP_PER_CPU_AREA def_bool PPC64 config IRQ_PER_CPU --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -66,7 +66,7 @@ config AUDIT_ARCH bool default y -config ARCH_SETS_UP_PER_CPU_AREA +config HAVE_SETUP_PER_CPU_AREA def_bool y config ARCH_NO_VIRT_TO_BUS --- a/init/main.c +++ b/init/main.c @@ -380,6 +380,8 @@ static void __init setup_per_cpu_areas(v /* Copy section for each CPU (we discard the original) */ size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE); + printk(KERN_INFO + "PERCPU: Allocating %lu bytes of per cpu data (main)\n", size); ptr = alloc_bootmem_pages(size * nr_possible_cpus); for_each_possible_cpu(i) { --