ia64/linux-2.6.18-xen.hg

changeset 871:9cbcc9008446 xen-3.4.0

xen/x86: don't initialize cpu_data[]'s apicid field on generic code

Afaict, this is not only redundant with the intialization done in
drivers/xen/core/smpboot.c, but actually results - at least for
secondary CPUs - in the Xen-specific value written to be later
overwritten with whatever the generic code determines (with no
guarantee that the two values are identical).

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu May 14 10:09:15 2009 +0100 (2009-05-14)
parents 9b9454800544
children 84d9b28550f6
files arch/i386/kernel/cpu/common-xen.c arch/x86_64/kernel/setup-xen.c
line diff
     1.1 --- a/arch/i386/kernel/cpu/common-xen.c	Thu May 14 10:08:40 2009 +0100
     1.2 +++ b/arch/i386/kernel/cpu/common-xen.c	Thu May 14 10:09:15 2009 +0100
     1.3 @@ -301,11 +301,13 @@ void __cpuinit generic_identify(struct c
     1.4  			if (c->x86 >= 0x6)
     1.5  				c->x86_model += ((tfms >> 16) & 0xF) << 4;
     1.6  			c->x86_mask = tfms & 15;
     1.7 +#ifndef CONFIG_XEN
     1.8  #ifdef CONFIG_X86_HT
     1.9  			c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0);
    1.10  #else
    1.11  			c->apicid = (ebx >> 24) & 0xFF;
    1.12  #endif
    1.13 +#endif
    1.14  		} else {
    1.15  			/* Have CPUID level 0 only - unheard of */
    1.16  			c->x86 = 4;
     2.1 --- a/arch/x86_64/kernel/setup-xen.c	Thu May 14 10:08:40 2009 +0100
     2.2 +++ b/arch/x86_64/kernel/setup-xen.c	Thu May 14 10:09:15 2009 +0100
     2.3 @@ -1380,7 +1380,9 @@ void __cpuinit identify_cpu(struct cpuin
     2.4  			c->x86_capability[2] = cpuid_edx(0x80860001);
     2.5  	}
     2.6  
     2.7 +#ifndef CONFIG_XEN
     2.8  	c->apicid = phys_pkg_id(0);
     2.9 +#endif
    2.10  
    2.11  	/*
    2.12  	 * Vendor-specific initialization.  In this section we