[Xen-changelog] x86_capability[] array is 32-bit ints, not longs.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1620, 2005/05/31 22:34:23+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        x86_capability[] array is 32-bit ints, not longs.
        Signed-off-by: Scott Parish <srparish@xxxxxxxxxx>



 arch/x86/cpu/common.c       |    6 +++---
 include/asm-x86/processor.h |   35 +++++++++++++++++------------------
 2 files changed, 20 insertions(+), 21 deletions(-)


diff -Nru a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
--- a/xen/arch/x86/cpu/common.c 2005-05-31 18:01:39 -04:00
+++ b/xen/arch/x86/cpu/common.c 2005-05-31 18:01:39 -04:00
@@ -331,7 +331,7 @@
 #ifdef NOISY_CAPS
        printk(KERN_DEBUG "CPU: After generic identify, caps:");
        for (i = 0; i < NCAPINTS; i++)
-               printk(" %08lx", c->x86_capability[i]);
+               printk(" %08x", c->x86_capability[i]);
        printk("\n");
 #endif
 
@@ -340,7 +340,7 @@
 #ifdef NOISY_CAPS
                printk(KERN_DEBUG "CPU: After vendor identify, caps:");
                for (i = 0; i < NCAPINTS; i++)
-                       printk(" %08lx", c->x86_capability[i]);
+                       printk(" %08x", c->x86_capability[i]);
                printk("\n");
 #endif
        }
@@ -395,7 +395,7 @@
 #ifdef NOISY_CAPS
        printk(KERN_DEBUG "CPU: After all inits, caps:");
        for (i = 0; i < NCAPINTS; i++)
-               printk(" %08lx", c->x86_capability[i]);
+               printk(" %08x", c->x86_capability[i]);
        printk("\n");
 #endif
        /*
diff -Nru a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
--- a/xen/include/asm-x86/processor.h   2005-05-31 18:01:40 -04:00
+++ b/xen/include/asm-x86/processor.h   2005-05-31 18:01:40 -04:00
@@ -146,24 +146,23 @@
 #endif
 
 struct cpuinfo_x86 {
-       __u8    x86;            /* CPU family */
-       __u8    x86_vendor;     /* CPU vendor */
-       __u8    x86_model;
-       __u8    x86_mask;
-       char    wp_works_ok;    /* It doesn't on 386's */
-       char    hlt_works_ok;   /* Problems on some 486Dx4's and old 386's */
-       char    hard_math;
-       char    rfu;
-               int     cpuid_level;    /* Maximum supported CPUID level, -1=no 
CPUID */
-       unsigned long   x86_capability[NCAPINTS];
-       char    x86_vendor_id[16];
-       char    x86_model_id[64];
-       int     x86_cache_size;  /* in KB - valid for CPUS which support this
-                                   call  */
-       int     x86_cache_alignment;    /* In bytes */
-       int     fdiv_bug;
-       int     f00f_bug;
-       int     coma_bug;
+       __u8 x86;               /* CPU family */
+       __u8 x86_vendor;        /* CPU vendor */
+       __u8 x86_model;
+       __u8 x86_mask;
+       char wp_works_ok;       /* It doesn't on 386's */
+       char hlt_works_ok;      /* Problems on some 486Dx4's and old 386's */
+       char hard_math;
+       char rfu;
+    int  cpuid_level;  /* Maximum supported CPUID level, -1=no CPUID */
+       unsigned int x86_capability[NCAPINTS];
+       char x86_vendor_id[16];
+       char x86_model_id[64];
+       int  x86_cache_size;  /* in KB - valid for CPUS which support this call 
 */
+       int  x86_cache_alignment;       /* In bytes */
+       int      fdiv_bug;
+       int      f00f_bug;
+       int      coma_bug;
        unsigned char x86_num_cores;
 } __cacheline_aligned;
 

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