aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/pci.h2
-rw-r--r--include/asm-x86/topology.h13
2 files changed, 15 insertions, 0 deletions
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
index ddd8e248fc0a..30bbde0cb34b 100644
--- a/include/asm-x86/pci.h
+++ b/include/asm-x86/pci.h
@@ -19,6 +19,8 @@ struct pci_sysdata {
19}; 19};
20 20
21/* scan a bus after allocating a pci_sysdata for it */ 21/* scan a bus after allocating a pci_sysdata for it */
22extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
23 int node);
22extern struct pci_bus *pci_scan_bus_with_sysdata(int busno); 24extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);
23 25
24static inline int pci_domain_nr(struct pci_bus *bus) 26static inline int pci_domain_nr(struct pci_bus *bus)
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index 22073268b481..4793ae745a78 100644
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -198,4 +198,17 @@ extern cpumask_t cpu_coregroup_map(int cpu);
198#define smt_capable() (smp_num_siblings > 1) 198#define smt_capable() (smp_num_siblings > 1)
199#endif 199#endif
200 200
201#ifdef CONFIG_NUMA
202extern int get_mp_bus_to_node(int busnum);
203extern void set_mp_bus_to_node(int busnum, int node);
204#else
205static inline int get_mp_bus_to_node(int busnum)
206{
207 return 0;
208}
209static inline void set_mp_bus_to_node(int busnum, int node)
210{
211}
212#endif
213
201#endif 214#endif