drop empty __devinitdata annotation

x86 is the only architecture which uses __devinitdata, and also has
CONFIG_HOTPLUG enabled, making the annotation empty.

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

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 16608b11e3768a3fe2c64f6ce1fd0cb2b06d3c66..310ec850a1680e149490414b1643393736b50928 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -19,20 +19,20 @@
 static bool_t use_xsave = 1;
 boolean_param("xsave", use_xsave);
 
-bool_t __devinitdata opt_arat = 1;
+bool_t opt_arat = 1;
 boolean_param("arat", opt_arat);
 
-unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u;
+unsigned int opt_cpuid_mask_ecx = ~0u;
 integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
-unsigned int __devinitdata opt_cpuid_mask_edx = ~0u;
+unsigned int opt_cpuid_mask_edx = ~0u;
 integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
 
-unsigned int __devinitdata opt_cpuid_mask_xsave_eax = ~0u;
+unsigned int opt_cpuid_mask_xsave_eax = ~0u;
 integer_param("cpuid_mask_xsave_eax", opt_cpuid_mask_xsave_eax);
 
-unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u;
+unsigned int opt_cpuid_mask_ext_ecx = ~0u;
 integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx);
-unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u;
+unsigned int opt_cpuid_mask_ext_edx = ~0u;
 integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx);
 
 const struct cpu_dev *__read_mostly cpu_devs[X86_VENDOR_NUM] = {};

diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index dc2b25192adeac05909728c68a2c69a5160ab613..497a4e96d594a45f835feaf60b2a2dcb77756225 100644 (file)
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -61,7 +61,7 @@ unsigned long __read_mostly mp_lapic_addr;
 unsigned int __read_mostly boot_cpu_physical_apicid = BAD_APICID;
 
 /* Internal processor count */
-static unsigned int __devinitdata num_processors;
+static unsigned int num_processors;
 static unsigned int __initdata disabled_cpus;
 
 /* Bitmask of physically existing CPUs */

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

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 075f98edc264dbb29b617557c4f863ad6a87ac0e..d29f828602cf2515848cfde1ceb637ddce29d962 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -108,7 +108,7 @@ void (*ioemul_handle_quirk)(
 static int debug_stack_lines = 20;
 integer_param("debug_stack_lines", debug_stack_lines);
 
-static bool_t __devinitdata opt_ler;
+static bool_t opt_ler;
 boolean_param("ler", opt_ler);
 
 #define stack_words_per_line 4

diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index b3bced37abec01d75073f2e7d7f5bf1e1ab0ffc2..e4117364311e08582b0993ef4e01ede84db20a73 100644 (file)
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -119,12 +119,10 @@ extern struct kernel_param __setup_start, __setup_end;
 
 #ifdef CONFIG_HOTPLUG
 #define __devinit
-#define __devinitdata
 #define __devexit
 #define __devexitdata
 #else
 #define __devinit __init
-#define __devinitdata __initdata
 #define __devexit __exit
 #define __devexitdata __exitdata
 #endif