]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
topology: alternate fix for ia64 tiger_defconfig build breakage
authorLee Schermerhorn <Lee.Schermerhorn@hp.com>
Tue, 10 Aug 2010 00:19:00 +0000 (17:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 03:44:57 +0000 (20:44 -0700)
commit251060006003b79b788f8ce5a827ee5354a42910
treeeb69ce45bd31ffc0609300afbe0cca2a2cbf2ab1
parentb645bd1286f2fbcd2eb4ab3bed5884f63c42e363
topology: alternate fix for ia64 tiger_defconfig build breakage

Define stubs for the numa_*_id() generic percpu related functions for
non-NUMA configurations in <asm-generic/topology.h> where the other
non-numa stubs live.

Fixes ia64 !NUMA build breakage -- e.g., tiger_defconfig

Back out now unneeded '#ifndef CONFIG_NUMA' guards from ia64 smpboot.c

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/ia64/Kconfig
arch/ia64/kernel/smpboot.c
include/asm-generic/topology.h
include/linux/topology.h