summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2010-04-24 09:56:53 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-26 14:29:18 -0700
commitb53d27ff66e343520df4d287c419235fbe6e3fea (patch)
tree9ab595b43e72a6b5cbb0c0beb3d983e40f12d175
parent7ff4b9ccdac041b6745b9c43ac2cc5639ffc8c1b (diff)
downloadlwn-b53d27ff66e343520df4d287c419235fbe6e3fea.tar.gz
lwn-b53d27ff66e343520df4d287c419235fbe6e3fea.zip
x86, k8: Fix build error when K8_NB is disabled
commit ade029e2aaacc8965a548b0b0f80c5bee97ffc68 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/x86/include/asm/k8.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h
index c2d1f3b58e5f..f0746f46990d 100644
--- a/arch/x86/include/asm/k8.h
+++ b/arch/x86/include/asm/k8.h
@@ -13,11 +13,16 @@ extern void k8_flush_garts(void);
extern int k8_scan_nodes(unsigned long start, unsigned long end);
#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;