x86: __{cpu,dev}initdata drop follow-up

While reviewing those patches I noticed a few types that could do with
tweaking.

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

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index c51aa168e59f15dd8fc828ddbee3524142e15ee8..8ec841b3e9735d1395540086d442a35abc3f150a 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -332,8 +332,6 @@ static void disable_c1_ramping(void)
        }
 }
 
-int force_mwait;
-
 static void disable_c1e(void *unused)
 {
        uint64_t msr_content;
@@ -510,7 +508,7 @@ static void init_amd(struct cpuinfo_x86 *c)
         amd_get_topology(c);
 
        /* Pointless to use MWAIT on Family10 as it does not deep sleep. */
-       if (c->x86 >= 0x10 && !force_mwait)
+       if (c->x86 == 0x10)
                __clear_bit(X86_FEATURE_MWAIT, c->x86_capability);
 
        if (!cpu_has_amd_erratum(c, AMD_ERRATUM_121))

diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c
index 980aa593dda87a277bed7c9cd1affcd9e9831611..bb02fe7fac20bd5851a6124f8dbb2e7c1a5de373 100644 (file)
--- a/xen/arch/x86/cpu/intel_cacheinfo.c
+++ b/xen/arch/x86/cpu/intel_cacheinfo.c
@@ -27,7 +27,7 @@ struct _cache_table
 };
 
 /* all the cache descriptor types we care about (no TLB or trace cache entries) */
-static struct _cache_table cache_table[] =
+static const struct _cache_table cache_table[] =
 {
        { 0x06, LVL_1_INST, 8 },        /* 4-way set assoc, 32 byte line size */
        { 0x08, LVL_1_INST, 16 },       /* 4-way set assoc, 32 byte line size */

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 9ba47b4dec4bc7b40e9fb84be3f81cff51cbe58e..b7abc02eb56fb77f7dd1635bccdad34b8b9e48dd 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -49,9 +49,8 @@ cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly;
 
 nodemask_t __read_mostly node_online_map = { { [0] = 1UL } };
 
-int numa_off = 0;
-
-int acpi_numa;
+bool_t numa_off = 0;
+s8 acpi_numa = 0;
 
 int srat_disabled(void)
 {

diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h
index cf479a99a531abc005bcdaea834e9f19acb7beb9..d3bde7883036b541b9a6c8fe8c69a8d1e1be83fe 100644 (file)
--- a/xen/include/asm-x86/acpi.h
+++ b/xen/include/asm-x86/acpi.h
@@ -107,7 +107,7 @@ extern void acpi_reserve_bootmem(void);
 
 #define ARCH_HAS_POWER_INIT    1
 
-extern int acpi_numa;
+extern s8 acpi_numa;
 extern int acpi_scan_nodes(u64 start, u64 end);
 #define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
 

diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h
index 0c5e5b4687cb389e5d89f1de734e084a79d431fb..9a2d7cc7417fe230f2dd082eb2d7c82d76536346 100644 (file)
--- a/xen/include/asm-x86/numa.h
+++ b/xen/include/asm-x86/numa.h
@@ -30,7 +30,7 @@ extern nodeid_t pxm_to_node(unsigned int pxm);
 
 extern void numa_add_cpu(int cpu);
 extern void numa_init_array(void);
-extern int numa_off;
+extern bool_t numa_off;
 
 
 extern int srat_disabled(void);