[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 4/6] xen: 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@xxxxxxxxxx> --- CC: Jan Beulich <JBeulich@xxxxxxxx> --- xen/arch/x86/cpu/common.c | 12 ++++++------ xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/numa.c | 4 ++-- xen/arch/x86/traps.c | 2 +- xen/include/xen/init.h | 2 -- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index ff3ff51..e6dde13 100644 --- 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 dc2b251..497a4e9 100644 --- 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 886871f..e688992 100644 --- 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 075f98e..d29f828 100644 --- 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 b3bced3..e411736 100644 --- 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 -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |