diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/k8.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/k8.h')
-rw-r--r-- | arch/x86/include/asm/k8.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h deleted file mode 100644 index af00bd1d2089..000000000000 --- a/arch/x86/include/asm/k8.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | #ifndef _ASM_X86_K8_H | ||
2 | #define _ASM_X86_K8_H | ||
3 | |||
4 | #include <linux/pci.h> | ||
5 | |||
6 | extern struct pci_device_id k8_nb_ids[]; | ||
7 | struct bootnode; | ||
8 | |||
9 | extern int early_is_k8_nb(u32 value); | ||
10 | extern struct pci_dev **k8_northbridges; | ||
11 | extern int num_k8_northbridges; | ||
12 | extern int cache_k8_northbridges(void); | ||
13 | extern void k8_flush_garts(void); | ||
14 | extern int k8_get_nodes(struct bootnode *nodes); | ||
15 | extern int k8_numa_init(unsigned long start_pfn, unsigned long end_pfn); | ||
16 | extern int k8_scan_nodes(void); | ||
17 | |||
18 | #ifdef CONFIG_K8_NB | ||
19 | extern int num_k8_northbridges; | ||
20 | |||
21 | static inline struct pci_dev *node_to_k8_nb_misc(int node) | ||
22 | { | ||
23 | return (node < num_k8_northbridges) ? k8_northbridges[node] : NULL; | ||
24 | } | ||
25 | |||
26 | #else | ||
27 | #define num_k8_northbridges 0 | ||
28 | |||
29 | static inline struct pci_dev *node_to_k8_nb_misc(int node) | ||
30 | { | ||
31 | return NULL; | ||
32 | } | ||
33 | #endif | ||
34 | |||
35 | |||
36 | #endif /* _ASM_X86_K8_H */ | ||