drop empty __cpuinitdata annotation

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

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 74a015237ecb73f7cc151d96ae55c56d37223876..3ebcc86cebe00c1ec08745c2bc94316415a5db7d 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -332,7 +332,7 @@ static void disable_c1_ramping(void)
        }
 }
 
-int force_mwait __cpuinitdata;
+int force_mwait;
 
 static void disable_c1e(void *unused)
 {

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 6b320a728ec9e86eb90b15197c1253e3db5ee205..16608b11e3768a3fe2c64f6ce1fd0cb2b06d3c66 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -16,7 +16,7 @@
 
 #include "cpu.h"
 
-static bool_t __cpuinitdata use_xsave = 1;
+static bool_t use_xsave = 1;
 boolean_param("xsave", use_xsave);
 
 bool_t __devinitdata opt_arat = 1;
@@ -45,7 +45,7 @@ unsigned int paddr_bits __read_mostly = 36;
  */
 u64 host_pat = 0x050100070406;
 
-static unsigned int __cpuinitdata cleared_caps[NCAPINTS];
+static unsigned int cleared_caps[NCAPINTS];
 
 void __init setup_clear_cpu_cap(unsigned int cap)
 {

diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c
index 48970c0479c939be305ab5d8eb1655150f723e6f..980aa593dda87a277bed7c9cd1affcd9e9831611 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[] __cpuinitdata =
+static 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 7e492d4f5ebab2e43c6dc1235ee2f21b14ff9313..6a8880fd7d4b8ecc774a024e2bc67963fbf19e63 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -42,7 +42,7 @@ nodeid_t cpu_to_node[NR_CPUS] __read_mostly = {
 /*
  * Keep BIOS's CPU2node information, should not be used for memory allocaion
  */
-nodeid_t apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
+nodeid_t apicid_to_node[MAX_LOCAL_APIC] = {
     [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
 };
 cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly;

diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c
index 65260f6da6c031b292a32b799d2ed88ce95bcb27..8bdd39e0513cec29b6cf341088d76dc7e2cb0d73 100644 (file)
--- a/xen/arch/x86/x86_64/mmconf-fam10h.c
+++ b/xen/arch/x86/x86_64/mmconf-fam10h.c
@@ -23,9 +23,9 @@ struct pci_hostbridge_probe {
        u32 device;
 };
 
-static u64 __cpuinitdata fam10h_pci_mmconf_base;
+static u64 fam10h_pci_mmconf_base;
 
-static struct pci_hostbridge_probe pci_probes[] __cpuinitdata = {
+static struct pci_hostbridge_probe pci_probes[] = {
        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
        { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
 };

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 450be86f782e83f2f53ece1dd9fbf471f9a548c8..89a590e0f17ee310b9ec51ce04944c6fb50858e3 100644 (file)
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -84,7 +84,6 @@
 #define mk_unsigned_long(x) x
 #endif /* !__ASSEMBLY__ */
 
-#define __cpuinitdata
 #define __cpuinit
 
 #ifdef FLASK_ENABLE