ia64/xen-unstable

changeset 5244:9c8495b33e75

bitkeeper revision 1.1620 (429cd85fOKc8jD7MTDCcMvlczZhiDg)

x86_capability[] array is 32-bit ints, not longs.
Signed-off-by: Scott Parish <srparish@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 31 21:34:23 2005 +0000 (2005-05-31)
parents fbb531d2ff13
children 0d0d1ee9a48c
files xen/arch/x86/cpu/common.c xen/include/asm-x86/processor.h
line diff
     1.1 --- a/xen/arch/x86/cpu/common.c	Tue May 31 17:13:13 2005 +0000
     1.2 +++ b/xen/arch/x86/cpu/common.c	Tue May 31 21:34:23 2005 +0000
     1.3 @@ -331,7 +331,7 @@ void __init identify_cpu(struct cpuinfo_
     1.4  #ifdef NOISY_CAPS
     1.5  	printk(KERN_DEBUG "CPU: After generic identify, caps:");
     1.6  	for (i = 0; i < NCAPINTS; i++)
     1.7 -		printk(" %08lx", c->x86_capability[i]);
     1.8 +		printk(" %08x", c->x86_capability[i]);
     1.9  	printk("\n");
    1.10  #endif
    1.11  
    1.12 @@ -340,7 +340,7 @@ void __init identify_cpu(struct cpuinfo_
    1.13  #ifdef NOISY_CAPS
    1.14  		printk(KERN_DEBUG "CPU: After vendor identify, caps:");
    1.15  		for (i = 0; i < NCAPINTS; i++)
    1.16 -			printk(" %08lx", c->x86_capability[i]);
    1.17 +			printk(" %08x", c->x86_capability[i]);
    1.18  		printk("\n");
    1.19  #endif
    1.20  	}
    1.21 @@ -395,7 +395,7 @@ void __init identify_cpu(struct cpuinfo_
    1.22  #ifdef NOISY_CAPS
    1.23  	printk(KERN_DEBUG "CPU: After all inits, caps:");
    1.24  	for (i = 0; i < NCAPINTS; i++)
    1.25 -		printk(" %08lx", c->x86_capability[i]);
    1.26 +		printk(" %08x", c->x86_capability[i]);
    1.27  	printk("\n");
    1.28  #endif
    1.29  	/*
     2.1 --- a/xen/include/asm-x86/processor.h	Tue May 31 17:13:13 2005 +0000
     2.2 +++ b/xen/include/asm-x86/processor.h	Tue May 31 21:34:23 2005 +0000
     2.3 @@ -146,24 +146,23 @@ struct exec_domain;
     2.4  #endif
     2.5  
     2.6  struct cpuinfo_x86 {
     2.7 -	__u8	x86;		/* CPU family */
     2.8 -	__u8	x86_vendor;	/* CPU vendor */
     2.9 -	__u8	x86_model;
    2.10 -	__u8	x86_mask;
    2.11 -	char	wp_works_ok;	/* It doesn't on 386's */
    2.12 -	char	hlt_works_ok;	/* Problems on some 486Dx4's and old 386's */
    2.13 -	char	hard_math;
    2.14 -	char	rfu;
    2.15 -       	int	cpuid_level;	/* Maximum supported CPUID level, -1=no CPUID */
    2.16 -	unsigned long	x86_capability[NCAPINTS];
    2.17 -	char	x86_vendor_id[16];
    2.18 -	char	x86_model_id[64];
    2.19 -	int 	x86_cache_size;  /* in KB - valid for CPUS which support this
    2.20 -				    call  */
    2.21 -	int 	x86_cache_alignment;	/* In bytes */
    2.22 -	int	fdiv_bug;
    2.23 -	int	f00f_bug;
    2.24 -	int	coma_bug;
    2.25 +	__u8 x86;		/* CPU family */
    2.26 +	__u8 x86_vendor;	/* CPU vendor */
    2.27 +	__u8 x86_model;
    2.28 +	__u8 x86_mask;
    2.29 +	char wp_works_ok;	/* It doesn't on 386's */
    2.30 +	char hlt_works_ok;	/* Problems on some 486Dx4's and old 386's */
    2.31 +	char hard_math;
    2.32 +	char rfu;
    2.33 +    int  cpuid_level;	/* Maximum supported CPUID level, -1=no CPUID */
    2.34 +	unsigned int x86_capability[NCAPINTS];
    2.35 +	char x86_vendor_id[16];
    2.36 +	char x86_model_id[64];
    2.37 +	int  x86_cache_size;  /* in KB - valid for CPUS which support this call  */
    2.38 +	int  x86_cache_alignment;	/* In bytes */
    2.39 +	int	 fdiv_bug;
    2.40 +	int	 f00f_bug;
    2.41 +	int	 coma_bug;
    2.42  	unsigned char x86_num_cores;
    2.43  } __cacheline_aligned;
    2.44