[tip:x86/urgent] x86, k8: Fix build error when K8_NB is disabled
in [Kernel]
|
Prev: [PATCH] Staging: udlfb: fix coding style issues
Next: [PATCH -tip/master] x86,perf: P4 PMU - fix counters management logic
From: tip-bot for Borislav Petkov on 14 May 2010 15:10 Commit-ID: ade029e2aaacc8965a548b0b0f80c5bee97ffc68 Gitweb: http://git.kernel.org/tip/ade029e2aaacc8965a548b0b0f80c5bee97ffc68 Author: Borislav Petkov <borislav.petkov(a)amd.com> AuthorDate: Sat, 24 Apr 2010 09:56:53 +0200 Committer: H. Peter Anvin <hpa(a)linux.intel.com> CommitDate: Fri, 14 May 2010 11:53:01 -0700 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(a)amd.com> LKML-Reference: <20100503183036.GJ26107(a)aftab> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> Cc: <stable(a)kernel.org> --- 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 f70e600..af00bd1 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |