public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
	x86@kernel•org
Subject: [PATCH] x86: fix build error when CONFIG_K8_NB=n
Date: Thu, 02 Apr 2009 08:29:41 -0700	[thread overview]
Message-ID: <49D4D9E5.2060705@oracle.com> (raw)
In-Reply-To: <20090402170432.9bc4fbf8.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle•com>

Fix build error when CONFIG_K8_NB=n:

arch/x86/mm/built-in.o:(.bss+0x5c0): multiple definition of `k8_northbridges'
arch/x86/kernel/built-in.o:(.bss+0x18c8): first defined here

Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
---
 arch/x86/include/asm/k8.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20090402.orig/arch/x86/include/asm/k8.h
+++ linux-next-20090402/arch/x86/include/asm/k8.h
@@ -9,7 +9,7 @@ extern int early_is_k8_nb(u32 value);
 #ifdef CONFIG_K8_NB
 extern struct pci_dev **k8_northbridges;
 #else
-struct pci_dev **k8_northbridges;
+static struct pci_dev **k8_northbridges;
 #endif
 extern int num_k8_northbridges;
 extern int cache_k8_northbridges(void);

  reply	other threads:[~2009-04-02 15:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-02  6:04 linux-next: Tree for April 2 Stephen Rothwell
2009-04-02 15:29 ` Randy Dunlap [this message]
2009-04-02 16:44   ` [PATCH] x86: fix build error when CONFIG_K8_NB=n Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49D4D9E5.2060705@oracle.com \
    --to=randy.dunlap@oracle$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=x86@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox