From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/6] xen: Drop empty __cpuinitdata annotation Date: Fri, 27 Nov 2015 19:58:09 +0000 Message-ID: <1448654293-16860-3-git-send-email-andrew.cooper3@citrix.com> References: <1448654293-16860-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1448654293-16860-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org Signed-off-by: Andrew Cooper --- CC: Jan Beulich --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 4 ++-- xen/arch/x86/cpu/intel_cacheinfo.c | 2 +- xen/arch/x86/numa.c | 2 +- xen/arch/x86/x86_64/mmconf-fam10h.c | 4 ++-- xen/include/xen/config.h | 1 - 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 74a0152..3ebcc86 100644 --- 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 e60929d..265fdbc 100644 --- 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 48970c0..980aa59 100644 --- 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 7e492d4..6a8880f 100644 --- 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 65260f6..8bdd39e 100644 --- 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 450be86..89a590e 100644 --- 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 -- 2.1.4