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/x86-64: adjustments to match i386

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] xen/x86-64: adjustments to match i386 behavior
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Sat, 02 Oct 2010 07:20:04 -0700
Delivery-date: Sat, 02 Oct 2010 07:20:13 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
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/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/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@xxxxxxx>
# Date 1286028420 -3600
# Node ID 93128220b8cff793943638c7b9048ccf0e0317f8
# Parent  a66a7c64b1d039fe4012a26164bbbbdc14727d61
xen/x86-64: adjustments to match i386 behavior

On i386 the corresponding code is inside X86_HT conditionals, and this
config variable is unconditionally off for X86_XEN.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/x86_64/kernel/setup-xen.c |    8 ++++----
 include/asm-x86_64/topology.h  |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -r a66a7c64b1d0 -r 93128220b8cf arch/x86_64/kernel/setup-xen.c
--- a/arch/x86_64/kernel/setup-xen.c    Wed Sep 22 10:25:42 2010 +0100
+++ b/arch/x86_64/kernel/setup-xen.c    Sat Oct 02 15:07:00 2010 +0100
@@ -1048,7 +1048,7 @@ static int nearby_node(int apicid)
  */
 static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
        unsigned bits;
 #ifdef CONFIG_NUMA
        int cpu = smp_processor_id();
@@ -1162,7 +1162,7 @@ static void __init init_amd(struct cpuin
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
        u32     eax, ebx, ecx, edx;
        int     index_msb, core_bits;
 
@@ -1347,7 +1347,7 @@ void __cpuinit early_identify_cpu(struct
                c->x86 = 4;
        }
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
        c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff;
 #endif
 }
@@ -1555,7 +1555,7 @@ static int show_cpuinfo(struct seq_file 
        if (c->x86_cache_size >= 0) 
                seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
        
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
        if (smp_num_siblings * c->x86_max_cores > 1) {
                int cpu = c - cpu_data;
                seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
diff -r a66a7c64b1d0 -r 93128220b8cf include/asm-x86_64/topology.h
--- a/include/asm-x86_64/topology.h     Wed Sep 22 10:25:42 2010 +0100
+++ b/include/asm-x86_64/topology.h     Sat Oct 02 15:07:00 2010 +0100
@@ -54,7 +54,7 @@ extern int __node_distance(int, int);
 
 #endif
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
 #define topology_physical_package_id(cpu)      (cpu_data[cpu].phys_proc_id)
 #define topology_core_id(cpu)                  (cpu_data[cpu].cpu_core_id)
 #define topology_core_siblings(cpu)            (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/x86-64: adjustments to match i386 behavior, Xen patchbot-linux-2.6.18-xen <=