diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/pci.h | 2 | ||||
-rw-r--r-- | include/asm-x86/topology.h | 16 |
2 files changed, 18 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 */ |
22 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, | ||
23 | int node); | ||
22 | extern struct pci_bus *pci_scan_bus_with_sysdata(int busno); | 24 | extern struct pci_bus *pci_scan_bus_with_sysdata(int busno); |
23 | 25 | ||
24 | static inline int pci_domain_nr(struct pci_bus *bus) | 26 | static 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..0e6d6b03affe 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h | |||
@@ -193,9 +193,25 @@ extern cpumask_t cpu_coregroup_map(int cpu); | |||
193 | #define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) | 193 | #define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) |
194 | #endif | 194 | #endif |
195 | 195 | ||
196 | struct pci_bus; | ||
197 | void set_pci_bus_resources_arch_default(struct pci_bus *b); | ||
198 | |||
196 | #ifdef CONFIG_SMP | 199 | #ifdef CONFIG_SMP |
197 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) | 200 | #define mc_capable() (boot_cpu_data.x86_max_cores > 1) |
198 | #define smt_capable() (smp_num_siblings > 1) | 201 | #define smt_capable() (smp_num_siblings > 1) |
199 | #endif | 202 | #endif |
200 | 203 | ||
204 | #ifdef CONFIG_NUMA | ||
205 | extern int get_mp_bus_to_node(int busnum); | ||
206 | extern void set_mp_bus_to_node(int busnum, int node); | ||
207 | #else | ||
208 | static inline int get_mp_bus_to_node(int busnum) | ||
209 | { | ||
210 | return 0; | ||
211 | } | ||
212 | static inline void set_mp_bus_to_node(int busnum, int node) | ||
213 | { | ||
214 | } | ||
215 | #endif | ||
216 | |||
201 | #endif | 217 | #endif |