LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Greg KH <gregkh@suse.de>, Muli Ben-Yehuda <muli@il.ibm.com>,
	Zhao Yakui <yakui.zhao@intel.com>,
	lenb@kernel.org, linux-acpi@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ACPI: Unneccessary to scan the PCI bus already scanned.
Date: Mon, 3 Mar 2008 11:10:40 +0100	[thread overview]
Message-ID: <20080303101040.GG18281@elte.hu> (raw)
In-Reply-To: <86802c440803030201i684f31c1m97fb3f1f1927d4f4@mail.gmail.com>


* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> also please use attached patch to replace the one patch in x86.git# 
> testing. old one can not be applied after Yakui's patch.

ok, thanks. Note, i still have the patch below filed up against it - is 
that still needed?

	Ingo

-------------->
Subject: x86: fix k8-bus_64.c build
From: Ingo Molnar <mingo@elte.hu>
Date: Wed Feb 20 10:30:15 CET 2008

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/pci/k8-bus_64.c   |    6 ++++++
 include/asm-x86/topology.h |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: linux-x86.q/arch/x86/pci/k8-bus_64.c
===================================================================
--- linux-x86.q.orig/arch/x86/pci/k8-bus_64.c
+++ linux-x86.q/arch/x86/pci/k8-bus_64.c
@@ -22,6 +22,8 @@
 #define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
 #define PCI_DEVICE_ID_K8HTCONFIG 0x1100
 
+#ifdef CONFIG_NUMA
+
 #define BUS_NR 256
 
 static int mp_bus_to_node[BUS_NR];
@@ -51,6 +53,8 @@ int get_mp_bus_to_node(int busnum)
 	return node;
 }
 
+#endif
+
 /**
  * early_fill_mp_bus_to_node()
  * called before pcibios_scan_root and pci_scan_bus
@@ -60,6 +64,7 @@ int get_mp_bus_to_node(int busnum)
 __init static int
 early_fill_mp_bus_to_node(void)
 {
+#ifdef CONFIG_NUMA
 	int i, j;
 	unsigned slot;
 	u32 ldtbus, nid;
@@ -111,6 +116,7 @@ early_fill_mp_bus_to_node(void)
 		if (node >= 0)
 			printk(KERN_DEBUG "bus: %02x to node: %02x\n", i, node);
 	}
+#endif
 	return 0;
 }
 
Index: linux-x86.q/include/asm-x86/topology.h
===================================================================
--- linux-x86.q.orig/include/asm-x86/topology.h
+++ linux-x86.q/include/asm-x86/topology.h
@@ -165,8 +165,8 @@ extern int __node_distance(int, int);
 #define node_distance(a, b) __node_distance(a, b)
 #endif
 
-int get_mp_bus_to_node(int busnum);
-void set_mp_bus_to_node(int busnum, int node);
+extern int get_mp_bus_to_node(int busnum);
+extern void set_mp_bus_to_node(int busnum, int node);
 
 #else /* CONFIG_NUMA */
 

  reply	other threads:[~2008-03-03 10:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1204525186.4080.11.camel@yakui_zhao.sh.intel.com>
     [not found] ` <20080303073214.GA5934@elte.hu>
     [not found]   ` <86802c440803030006m1879838awc238f07bc98ed43e@mail.gmail.com>
     [not found]     ` <86802c440803030030p4ff9cec5tdb25d1cdc131d377@mail.gmail.com>
2008-03-03 10:01       ` Yinghai Lu
2008-03-03 10:10         ` Ingo Molnar [this message]
2008-03-03 10:33           ` Yinghai Lu
2008-03-03 11:11             ` Ingo Molnar
2008-03-03 18:57               ` Yinghai Lu
2008-03-04 19:28                 ` Yinghai Lu
2008-03-04 19:34                   ` Yinghai Lu
2008-03-04 21:23                     ` Ingo Molnar
2008-03-03 10:11         ` Ingo Molnar
2008-03-03 10:30           ` Yinghai Lu

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=20080303101040.GG18281@elte.hu \
    --to=mingo@elte.hu \
    --cc=gregkh@suse.de \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=muli@il.ibm.com \
    --cc=yakui.zhao@intel.com \
    --cc=yhlu.kernel@gmail.com \
    --subject='Re: [PATCH] ACPI: Unneccessary to scan the PCI bus already scanned.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).