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-x86/topology.h | |
parent | f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 (diff) | |
parent | fe086a7bea7ab714930bd48addba961ceeef7634 (diff) | |
download | kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.zip kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.gz kernel_samsung_espresso10-33ae0cdd3eaba219e7c2f0647b6db4be540e2130.tar.bz2 |
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-x86/topology.h')
-rw-r--r-- | include/asm-x86/topology.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 0e6d6b0..4f35a0f 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -193,6 +193,10 @@ extern cpumask_t cpu_coregroup_map(int cpu); #define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) #endif +static inline void arch_fix_phys_package_id(int num, u32 slot) +{ +} + struct pci_bus; void set_pci_bus_resources_arch_default(struct pci_bus *b); |