* [tip:x86/cpu] x86, k8: Fix build error when K8_NB is disabled
[not found] <20100503183036.GJ26107@aftab>
@ 2010-05-03 22:41 ` tip-bot for Borislav Petkov
2010-05-14 19:00 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
1 sibling, 0 replies; 2+ messages in thread
From: tip-bot for Borislav Petkov @ 2010-05-03 22:41 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, tglx, borislav.petkov
Commit-ID: d88d95eb1c2a72b6126a550debe0883ff723a948
Gitweb: http://git.kernel.org/tip/d88d95eb1c2a72b6126a550debe0883ff723a948
Author: Borislav Petkov <borislav.petkov@amd.com>
AuthorDate: Sat, 24 Apr 2010 09:56:53 +0200
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 3 May 2010 14:34:24 -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@amd.com>
LKML-Reference: <20100503183036.GJ26107@aftab>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
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;
^ permalink raw reply [flat|nested] 2+ messages in thread* [tip:x86/urgent] x86, k8: Fix build error when K8_NB is disabled
[not found] <20100503183036.GJ26107@aftab>
2010-05-03 22:41 ` [tip:x86/cpu] x86, k8: Fix build error when K8_NB is disabled tip-bot for Borislav Petkov
@ 2010-05-14 19:00 ` tip-bot for Borislav Petkov
1 sibling, 0 replies; 2+ messages in thread
From: tip-bot for Borislav Petkov @ 2010-05-14 19:00 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, stable, tglx, borislav.petkov
Commit-ID: ade029e2aaacc8965a548b0b0f80c5bee97ffc68
Gitweb: http://git.kernel.org/tip/ade029e2aaacc8965a548b0b0f80c5bee97ffc68
Author: Borislav Petkov <borislav.petkov@amd.com>
AuthorDate: Sat, 24 Apr 2010 09:56:53 +0200
Committer: H. Peter Anvin <hpa@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@amd.com>
LKML-Reference: <20100503183036.GJ26107@aftab>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: <stable@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;
^ permalink raw reply [flat|nested] 2+ messages in thread