WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [linux-2.6.18-xen] xen smpboot: Fix a merge oversight.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] xen smpboot: Fix a merge oversight.
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 07 Dec 2007 08:20:19 -0800
Delivery-date: Fri, 07 Dec 2007 08:21:48 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196955845 0
# Node ID 69bb553015ce4ef88e33bd296a3f1a38011c7fa3
# Parent  f54c5dca67f7bef77b074698230f687f5b823b79
xen smpboot: Fix a merge oversight.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 drivers/xen/core/smpboot.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff -r f54c5dca67f7 -r 69bb553015ce drivers/xen/core/smpboot.c
--- a/drivers/xen/core/smpboot.c        Thu Dec 06 15:27:06 2007 +0000
+++ b/drivers/xen/core/smpboot.c        Thu Dec 06 15:44:05 2007 +0000
@@ -38,10 +38,6 @@ extern void smp_trap_init(trap_info_t *)
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
-int phys_proc_id[NR_CPUS]; /* Package ID of each logical CPU */
-EXPORT_SYMBOL(phys_proc_id);
-int cpu_core_id[NR_CPUS]; /* Core ID of each logical CPU */
-EXPORT_SYMBOL(cpu_core_id);
 
 cpumask_t cpu_online_map;
 EXPORT_SYMBOL(cpu_online_map);
@@ -98,8 +94,8 @@ static inline void
 static inline void
 set_cpu_sibling_map(int cpu)
 {
-       phys_proc_id[cpu] = cpu;
-       cpu_core_id[cpu]  = 0;
+       cpu_data[cpu].phys_proc_id = cpu;
+       cpu_data[cpu].cpu_core_id  = 0;
 
        cpu_sibling_map[cpu] = cpumask_of_cpu(cpu);
        cpu_core_map[cpu]    = cpumask_of_cpu(cpu);
@@ -110,8 +106,8 @@ static void
 static void
 remove_siblinginfo(int cpu)
 {
-       phys_proc_id[cpu] = BAD_APICID;
-       cpu_core_id[cpu]  = BAD_APICID;
+       cpu_data[cpu].phys_proc_id = BAD_APICID;
+       cpu_data[cpu].cpu_core_id  = BAD_APICID;
 
        cpus_clear(cpu_sibling_map[cpu]);
        cpus_clear(cpu_core_map[cpu]);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] xen smpboot: Fix a merge oversight., Xen patchbot-linux-2.6.18-xen <=