x86: use standard C types in struct cpuinfo_x86

Consolidate this to use exclusively standard types, and change oprofile
code (apparently trying to mirror those types) at the same time. Where
sensible actually drop local variables.

No functional change intended.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h
index b95d2483212a252af790c24aa270514d36f388c1..8a73d3d8b1f2786ccb60d9c814904e8416ccef8e 100644 (file)
--- a/xen/arch/x86/include/asm/processor.h
+++ b/xen/arch/x86/include/asm/processor.h
@@ -119,24 +119,24 @@ struct x86_cpu_id {
 };
 
 struct cpuinfo_x86 {
-    __u8 x86;            /* CPU family */
-    __u8 x86_vendor;     /* CPU vendor */
-    __u8 x86_model;
-    __u8 x86_mask;
+    uint8_t x86;            /* CPU family */
+    uint8_t x86_vendor;     /* CPU vendor */
+    uint8_t x86_model;
+    uint8_t x86_mask;
     int  cpuid_level;    /* Maximum supported CPUID level, -1=no CPUID */
-    __u32 extended_cpuid_level; /* Maximum supported CPUID extended level */
+    uint32_t extended_cpuid_level; /* Maximum supported CPUID extended level */
     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 */
-    __u32 x86_max_cores; /* cpuid returned max cores value */
-    __u32 booted_cores;  /* number of cores as seen by OS */
-    __u32 x86_num_siblings; /* cpuid logical cpus per chip value */
-    __u32 apicid;
-    __u32 phys_proc_id;    /* package ID of each logical CPU */
-    __u32 cpu_core_id;     /* core ID of each logical CPU*/
-    __u32 compute_unit_id; /* AMD compute unit ID of each logical CPU */
+    uint32_t x86_max_cores;   /* cpuid returned max cores value */
+    uint32_t booted_cores;    /* number of cores as seen by OS */
+    uint32_t x86_num_siblings; /* cpuid logical cpus per chip value */
+    uint32_t apicid;
+    uint32_t phys_proc_id;    /* package ID of each logical CPU */
+    uint32_t cpu_core_id;     /* core ID of each logical CPU */
+    uint32_t compute_unit_id; /* AMD compute unit ID of each logical CPU */
     unsigned short x86_clflush_size;
 } __cacheline_aligned;
 

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index a90b72825818850f947a54f0f7fc0ed7d014e9be..17bf3135f86ff3f5975e753048f36646a12be1ac 100644 (file)
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -311,11 +311,11 @@ void nmi_stop(void)
 
 static int __init p4_init(char ** cpu_type)
 {
-       __u8 cpu_model = current_cpu_data.x86_model;
+       unsigned int cpu_model = current_cpu_data.x86_model;
 
        if ((cpu_model > 6) || (cpu_model == 5)) {
                printk("xenoprof: Initialization failed. "
-                      "Intel processor model %d for pentium 4 family is not "
+                      "Intel processor model %u for pentium 4 family is not "
                       "supported\n", cpu_model);
                return 0;
        }
@@ -355,12 +355,10 @@ custom_param("cpu_type", force_cpu_type);
 
 static int __init ppro_init(char ** cpu_type)
 {
-       __u8 cpu_model = current_cpu_data.x86_model;
-
        if (force_arch_perfmon && cpu_has_arch_perfmon)
                return 0;
 
-       switch (cpu_model) {
+       switch (current_cpu_data.x86_model) {
        case 14:
                *cpu_type = "i386/core";
                break;
@@ -390,9 +388,8 @@ static int __init arch_perfmon_init(char **cpu_type)
 
 static int __init cf_check nmi_init(void)
 {
-       __u8 vendor = current_cpu_data.x86_vendor;
-       __u8 family = current_cpu_data.x86;
-       __u8 _model = current_cpu_data.x86_model;
+       unsigned int vendor = current_cpu_data.x86_vendor;
+       unsigned int family = current_cpu_data.x86;
 
        if (!cpu_has_apic) {
                printk("xenoprof: Initialization failed. No APIC\n");
@@ -406,7 +403,7 @@ static int __init cf_check nmi_init(void)
                        switch (family) {
                        default:
                                printk("xenoprof: Initialization failed. "
-                                      "AMD processor family %d is not "
+                                      "AMD processor family %u is not "
                                       "supported\n", family);
                                return -ENODEV;
                        case 0xf:
@@ -458,15 +455,15 @@ static int __init cf_check nmi_init(void)
                        }
                        if (!cpu_type && !arch_perfmon_init(&cpu_type)) {
                                printk("xenoprof: Initialization failed. "
-                                      "Intel processor family %d model %d "
-                                      "is not supported\n", family, _model);
+                                      "Intel processor family %u model %d is not supported\n",
+                                      family, current_cpu_data.x86_model);
                                return -ENODEV;
                        }
                        break;
 
                default:
                        printk("xenoprof: Initialization failed. "
-                              "Unsupported processor. Unknown vendor %d\n",
+                              "Unsupported processor. Unknown vendor %u\n",
                                vendor);
                        return -ENODEV;
        }