diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2010-04-24 09:56:53 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-14 20:53:01 +0200 |
| commit | ade029e2aaacc8965a548b0b0f80c5bee97ffc68 (patch) | |
| tree | 6b007dcdf36b35a091b8a466648b1104828a94ce | |
| parent | x86, amd: Check X86_FEATURE_OSVW bit before accessing OSVW MSRs (diff) | |
| download | linux-ade029e2aaacc8965a548b0b0f80c5bee97ffc68.tar.xz linux-ade029e2aaacc8965a548b0b0f80c5bee97ffc68.zip | |
x86, k8: Fix build error when K8_NB is disabled
K8_NB depends on PCI and when the last is disabled (allnoconfig) we fail
at the final linking stage due to missing exported num_k8_northbridges.
Add a header stub for that.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <20100503183036.GJ26107@aftab>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: <stable@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/k8.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h index f70e60071fe8..af00bd1d2089 100644 --- a/arch/x86/include/asm/k8.h +++ b/arch/x86/include/asm/k8.h @@ -16,11 +16,16 @@ extern int k8_numa_init(unsigned long start_pfn, unsigned long end_pfn); extern int k8_scan_nodes(void); #ifdef CONFIG_K8_NB +extern int num_k8_northbridges; + static inline struct pci_dev *node_to_k8_nb_misc(int node) { return (node < num_k8_northbridges) ? k8_northbridges[node] : NULL; } + #else +#define num_k8_northbridges 0 + static inline struct pci_dev *node_to_k8_nb_misc(int node) { return NULL; |