Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / include / asm-x86 / topology.h

diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index 0e6d6b03affe13071ab3f6da6b5ffa7b369a0766..4f35a0fb4f22ac5ba6d459a45f4eb8971eb50cac 100644 (file)
--- 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);