diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 16:50:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 16:50:49 -0700 |
commit | 33ae0cdd3eaba219e7c2f0647b6db4be540e2130 (patch) | |
tree | 1d0cb11644b40b500ad98e7af3bcac78012dec59 /include/asm-ia64/topology.h | |
parent | f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 (diff) | |
parent | fe086a7bea7ab714930bd48addba961ceeef7634 (diff) | |
download | op-kernel-dev-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.zip op-kernel-dev-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.gz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
[IA64] allocate multiple contiguous pages via uncached allocator
[IA64] bugfix: nptcg breaks cpu-hotadd
Diffstat (limited to 'include/asm-ia64/topology.h')
-rw-r--r-- | include/asm-ia64/topology.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h index f2f72ef..32863b3 100644 --- a/include/asm-ia64/topology.h +++ b/include/asm-ia64/topology.h @@ -116,6 +116,8 @@ void build_cpu_to_node_map(void); #define smt_capable() (smp_num_siblings > 1) #endif +extern void arch_fix_phys_package_id(int num, u32 slot); + #define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ CPU_MASK_ALL : \ node_to_cpumask(pcibus_to_node(bus)) \ |