[PATCH 0/6] xen: Drop unused or empty annotations

[PATCH 0/6] xen: Drop unused or empty annotations

[Andrew Cooper]

No resulting change on any architecture.

Andrew Cooper (6):
  xen: Drop unused fastcall annotation
  xen: Drop empty __cpuinitdata annotation
  xen: Drop empty __cpuinit annotation
  xen: Drop empty __devinitdata annotation
  xen: Drop empty __devinit annotation, and aliased __pminit
  xen: Drop unused __devexit{,data} and CONFIG_HOTPLUG

 xen/arch/arm/cpu.c                  |  2 +-
 xen/arch/arm/gic-hip04.c            |  6 +++---
 xen/arch/arm/gic-v2.c               |  6 +++---
 xen/arch/arm/gic-v3.c               |  6 +++---
 xen/arch/arm/gic.c                  |  4 ++--
 xen/arch/arm/irq.c                  |  4 ++--
 xen/arch/arm/mm.c                   |  2 +-
 xen/arch/arm/smpboot.c              |  6 +++---
 xen/arch/arm/time.c                 |  2 +-
 xen/arch/arm/traps.c                |  2 +-
 xen/arch/x86/apic.c                 |  6 +++---
 xen/arch/x86/cpu/amd.c              |  8 ++++----
 xen/arch/x86/cpu/common.c           | 34 +++++++++++++++++-----------------
 xen/arch/x86/cpu/intel.c            | 10 +++++-----
 xen/arch/x86/cpu/intel_cacheinfo.c  |  6 +++---
 xen/arch/x86/i8259.c                |  2 +-
 xen/arch/x86/mpparse.c              | 10 +++++-----
 xen/arch/x86/nmi.c                  | 12 +++++-------
 xen/arch/x86/numa.c                 | 10 +++++-----
 xen/arch/x86/setup.c                |  2 +-
 xen/arch/x86/traps.c                |  4 ++--
 xen/arch/x86/x86_64/mmconf-fam10h.c |  6 +++---
 xen/arch/x86/x86_64/traps.c         |  2 +-
 xen/crypto/vmac.c                   |  3 ---
 xen/include/asm-arm/gic.h           |  2 +-
 xen/include/asm-arm/mm.h            |  4 ++--
 xen/include/asm-arm/p2m.h           |  2 +-
 xen/include/asm-arm/time.h          |  2 +-
 xen/include/asm-x86/config.h        |  1 -
 xen/include/xen/config.h            |  4 ----
 xen/include/xen/init.h              | 12 ------------
 31 files changed, 80 insertions(+), 102 deletions(-)

-- 
2.1.4

[PATCH 1/6] xen: Drop unused fastcall annotation

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 xen/crypto/vmac.c        | 3 ---
 xen/include/xen/config.h | 1 -
 2 files changed, 4 deletions(-)

diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c
index 8f2f372..f3f2743 100644
--- a/xen/crypto/vmac.c
+++ b/xen/crypto/vmac.c
@@ -173,15 +173,12 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff);  /* Poly key mask     */
 #if __GNUC__
 #define ALIGN(n)      __attribute__ ((aligned(n))) 
 #define NOINLINE      __attribute__ ((noinline))
-#define FASTCALL
 #elif _MSC_VER
 #define ALIGN(n)      __declspec(align(n))
 #define NOINLINE      __declspec(noinline)
-#define FASTCALL      __fastcall
 #else
 #define ALIGN(n)
 #define NOINLINE
-#define FASTCALL
 #endif
 
 /* ----------------------------------------------------------------------- */
diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index f7258c7..450be86 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 fastcall
 #define __cpuinitdata
 #define __cpuinit
 
-- 
2.1.4

[PATCH 2/6] xen: Drop empty __cpuinitdata annotation

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 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

[PATCH 3/6] xen: Drop empty __cpuinit annotation

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Stefano Stabellini <stefano.stabellini@citrix.com>
---
 xen/arch/arm/cpu.c                  |  2 +-
 xen/arch/arm/gic-hip04.c            |  6 +++---
 xen/arch/arm/gic-v2.c               |  6 +++---
 xen/arch/arm/gic-v3.c               |  6 +++---
 xen/arch/arm/gic.c                  |  4 ++--
 xen/arch/arm/irq.c                  |  4 ++--
 xen/arch/arm/mm.c                   |  2 +-
 xen/arch/arm/smpboot.c              |  6 +++---
 xen/arch/arm/time.c                 |  2 +-
 xen/arch/arm/traps.c                |  2 +-
 xen/arch/x86/cpu/common.c           | 18 +++++++++---------
 xen/arch/x86/cpu/intel_cacheinfo.c  |  4 ++--
 xen/arch/x86/numa.c                 |  4 ++--
 xen/arch/x86/x86_64/mmconf-fam10h.c |  2 +-
 xen/include/asm-arm/gic.h           |  2 +-
 xen/include/asm-arm/mm.h            |  4 ++--
 xen/include/asm-arm/p2m.h           |  2 +-
 xen/include/asm-arm/time.h          |  2 +-
 xen/include/xen/config.h            |  2 --
 19 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/xen/arch/arm/cpu.c b/xen/arch/arm/cpu.c
index afc564f..d21651c 100644
--- a/xen/arch/arm/cpu.c
+++ b/xen/arch/arm/cpu.c
@@ -17,7 +17,7 @@
 
 #include <asm/processor.h>
 
-void __cpuinit identify_cpu(struct cpuinfo_arm *c)
+void identify_cpu(struct cpuinfo_arm *c)
 {
         c->midr.bits = READ_SYSREG32(MIDR_EL1);
         c->mpidr.bits = READ_SYSREG(MPIDR_EL1);
diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c
index 310f35a..a42cf24 100644
--- a/xen/arch/arm/gic-hip04.c
+++ b/xen/arch/arm/gic-hip04.c
@@ -306,7 +306,7 @@ static void __init hip04gic_dist_init(void)
     writel_gicd(GICD_CTL_ENABLE, GICD_CTLR);
 }
 
-static void __cpuinit hip04gic_cpu_init(void)
+static void hip04gic_cpu_init(void)
 {
     int i;
 
@@ -344,7 +344,7 @@ static void hip04gic_cpu_disable(void)
     writel_gicc(0x0, GICC_CTLR);
 }
 
-static void __cpuinit hip04gic_hyp_init(void)
+static void hip04gic_hyp_init(void)
 {
     uint32_t vtr;
     uint8_t nr_lrs;
@@ -354,7 +354,7 @@ static void __cpuinit hip04gic_hyp_init(void)
     gicv2_info.nr_lrs = nr_lrs;
 }
 
-static void __cpuinit hip04gic_hyp_disable(void)
+static void hip04gic_hyp_disable(void)
 {
     writel_gich(0, GICH_HCR);
 }
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 01e36b5..793dca7 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -292,7 +292,7 @@ static void __init gicv2_dist_init(void)
     writel_gicd(GICD_CTL_ENABLE, GICD_CTLR);
 }
 
-static void __cpuinit gicv2_cpu_init(void)
+static void gicv2_cpu_init(void)
 {
     int i;
 
@@ -330,7 +330,7 @@ static void gicv2_cpu_disable(void)
     writel_gicc(0x0, GICC_CTLR);
 }
 
-static void __cpuinit gicv2_hyp_init(void)
+static void gicv2_hyp_init(void)
 {
     uint32_t vtr;
     uint8_t nr_lrs;
@@ -340,7 +340,7 @@ static void __cpuinit gicv2_hyp_init(void)
     gicv2_info.nr_lrs = nr_lrs;
 }
 
-static void __cpuinit gicv2_hyp_disable(void)
+static void gicv2_hyp_disable(void)
 {
     writel_gich(0, GICH_HCR);
 }
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index 4fe0c37..a245b56 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -676,7 +676,7 @@ static int __init gicv3_populate_rdist(void)
     return -ENODEV;
 }
 
-static int __cpuinit gicv3_cpu_init(void)
+static int gicv3_cpu_init(void)
 {
     int i;
     uint32_t priority;
@@ -737,7 +737,7 @@ static void gicv3_cpu_disable(void)
     isb();
 }
 
-static void __cpuinit gicv3_hyp_init(void)
+static void gicv3_hyp_init(void)
 {
     uint32_t vtr;
 
@@ -768,7 +768,7 @@ static int gicv3_secondary_cpu_init(void)
     return res;
 }
 
-static void __cpuinit gicv3_hyp_disable(void)
+static void gicv3_hyp_disable(void)
 {
     uint32_t hcr;
 
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 1e1e5ba..0b3f634 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -305,7 +305,7 @@ void smp_send_state_dump(unsigned int cpu)
 }
 
 /* Set up the per-CPU parts of the GIC for a secondary CPU */
-void __cpuinit gic_init_secondary_cpu(void)
+void gic_init_secondary_cpu(void)
 {
     gic_hw_ops->secondary_init();
     /* Clear LR mask for secondary cpus */
@@ -695,7 +695,7 @@ void gic_dump_info(struct vcpu *v)
     }
 }
 
-void __cpuinit init_maintenance_interrupt(void)
+void init_maintenance_interrupt(void)
 {
     request_irq(gic_hw_ops->info->maintenance_irq, 0, maintenance_interrupt,
                 "irq-maintenance", NULL);
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 1f38605..d409abb 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -85,7 +85,7 @@ static int __init init_irq_data(void)
     return 0;
 }
 
-static int __cpuinit init_local_irq_data(void)
+static int init_local_irq_data(void)
 {
     int irq;
 
@@ -124,7 +124,7 @@ void __init init_IRQ(void)
     BUG_ON(init_irq_data() < 0);
 }
 
-void __cpuinit init_secondary_IRQ(void)
+void init_secondary_IRQ(void)
 {
     BUG_ON(init_local_irq_data() < 0);
 }
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 8b6d915..47bfb27 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -620,7 +620,7 @@ int init_secondary_pagetables(int cpu)
 #endif
 
 /* MMU setup for secondary CPUS (which already have paging enabled) */
-void __cpuinit mmu_init_secondary_cpu(void)
+void mmu_init_secondary_cpu(void)
 {
     /* From now on, no mapping may be both writable and executable. */
     WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2);
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index a96cda2..00b2b2a 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -264,9 +264,9 @@ smp_prepare_cpus (unsigned int max_cpus)
 }
 
 /* Boot the current CPU */
-void __cpuinit start_secondary(unsigned long boot_phys_offset,
-                               unsigned long fdt_paddr,
-                               unsigned long hwid)
+void start_secondary(unsigned long boot_phys_offset,
+                     unsigned long fdt_paddr,
+                     unsigned long hwid)
 {
     unsigned int cpuid = init_data.cpuid;
 
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 6207615..40f4758 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -230,7 +230,7 @@ static void check_timer_irq_cfg(unsigned int irq, const char *which)
 }
 
 /* Set up the timer interrupt on this CPU */
-void __cpuinit init_timer_interrupt(void)
+void init_timer_interrupt(void)
 {
     /* Sensible defaults */
     WRITE_SYSREG64(0, CNTVOFF_EL2);     /* No VM-specific offset */
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index c49bd3f..83744e8 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -99,7 +99,7 @@ static int debug_stack_lines = 40;
 integer_param("debug_stack_lines", debug_stack_lines);
 
 
-void __cpuinit init_traps(void)
+void init_traps(void)
 {
     /* Setup Hyp vector base */
     WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2);
diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 265fdbc..ff3ff51 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -70,7 +70,7 @@ static const struct cpu_dev *this_cpu = &default_cpu;
 bool_t opt_cpu_info;
 boolean_param("cpuinfo", opt_cpu_info);
 
-int __cpuinit get_model_name(struct cpuinfo_x86 *c)
+int get_model_name(struct cpuinfo_x86 *c)
 {
 	unsigned int *v;
 	char *p, *q;
@@ -100,7 +100,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c)
 }
 
 
-void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
+void display_cacheinfo(struct cpuinfo_x86 *c)
 {
 	unsigned int dummy, ecx, edx, l2size;
 
@@ -212,7 +212,7 @@ static void __init early_cpu_detect(void)
 		paddr_bits = cpuid_eax(0x80000008) & 0xff;
 }
 
-static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
+static void generic_identify(struct cpuinfo_x86 *c)
 {
 	u32 eax, ebx, ecx, edx, tmp;
 
@@ -271,7 +271,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
 /*
  * This does the hard work of actually picking apart the CPU stuff...
  */
-void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+void identify_cpu(struct cpuinfo_x86 *c)
 {
 	int i;
 
@@ -377,7 +377,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  * Check for extended topology enumeration cpuid leaf 0xb and if it
  * exists, use it for cpu topology detection.
  */
-void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
+void detect_extended_topology(struct cpuinfo_x86 *c)
 {
 	unsigned int eax, ebx, ecx, edx, sub_index;
 	unsigned int ht_mask_width, core_plus_mask_width;
@@ -434,7 +434,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
 	}
 }
 
-void __cpuinit detect_ht(struct cpuinfo_x86 *c)
+void detect_ht(struct cpuinfo_x86 *c)
 {
 	u32 	eax, ebx, ecx, edx;
 	int 	index_msb, core_bits;
@@ -509,7 +509,7 @@ unsigned int __init apicid_to_socket(unsigned int apicid)
 	return apicid;
 }
 
-void __cpuinit print_cpu_info(unsigned int cpu)
+void print_cpu_info(unsigned int cpu)
 {
 	const struct cpuinfo_x86 *c = cpu_data + cpu;
 	const char *vendor = NULL;
@@ -560,7 +560,7 @@ void __init early_cpu_init(void)
  * - Inserts TSS selector into regular and compat GDTs
  * - Loads GDT, IDT, TR then null LDT
  */
-void __cpuinit load_system_tables(void)
+void load_system_tables(void)
 {
 	unsigned int cpu = smp_processor_id();
 	unsigned long stack_bottom = get_stack_bottom(),
@@ -613,7 +613,7 @@ void __cpuinit load_system_tables(void)
  * and IDT. We reload them nevertheless, this function acts as a
  * 'CPU state barrier', nothing should get across.
  */
-void __cpuinit cpu_init(void)
+void cpu_init(void)
 {
 	int cpu = smp_processor_id();
 
diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c
index 980aa59..e505df1 100644
--- a/xen/arch/x86/cpu/intel_cacheinfo.c
+++ b/xen/arch/x86/cpu/intel_cacheinfo.c
@@ -104,7 +104,7 @@ int cpuid4_cache_lookup(int index, struct cpuid4_info *this_leaf)
 	return 0;
 }
 
-static int __cpuinit find_num_cache_leaves(void)
+static int find_num_cache_leaves(void)
 {
 	unsigned int		eax, ebx, ecx, edx;
 	union _cpuid4_leaf_eax	cache_eax;
@@ -119,7 +119,7 @@ static int __cpuinit find_num_cache_leaves(void)
 	return i;
 }
 
-unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
+unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c)
 {
 	unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */
 	unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 6a8880f..886871f 100644
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -290,12 +290,12 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
                     (u64)end_pfn << PAGE_SHIFT);
 }
 
-__cpuinit void numa_add_cpu(int cpu)
+void numa_add_cpu(int cpu)
 {
     cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
 } 
 
-void __cpuinit numa_set_node(int cpu, nodeid_t node)
+void numa_set_node(int cpu, nodeid_t node)
 {
     cpu_to_node[cpu] = node;
 }
diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c
index 8bdd39e..ed0acb9 100644
--- a/xen/arch/x86/x86_64/mmconf-fam10h.c
+++ b/xen/arch/x86/x86_64/mmconf-fam10h.c
@@ -137,7 +137,7 @@ static void __init get_fam10h_pci_mmconf_base(void)
 		fam10h_pci_mmconf_base = start;
 }
 
-void __cpuinit fam10h_check_enable_mmcfg(void)
+void fam10h_check_enable_mmcfg(void)
 {
 	u64 val;
 	bool_t print = opt_cpu_info;
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 42a2eec..630bb33 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -237,7 +237,7 @@ extern void gic_inject(void);
 extern void gic_clear_pending_irqs(struct vcpu *v);
 extern int gic_events_need_delivery(void);
 
-extern void __cpuinit init_maintenance_interrupt(void);
+extern void init_maintenance_interrupt(void);
 extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq,
         unsigned int priority);
 extern void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq);
diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
index a95082e..69e770a 100644
--- a/xen/include/asm-arm/mm.h
+++ b/xen/include/asm-arm/mm.h
@@ -157,9 +157,9 @@ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr);
 extern void remove_early_mappings(void);
 /* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the
  * new page table */
-extern int __cpuinit init_secondary_pagetables(int cpu);
+extern int init_secondary_pagetables(int cpu);
 /* Switch secondary CPUS to its own pagetables and finalise MMU setup */
-extern void __cpuinit mmu_init_secondary_cpu(void);
+extern void mmu_init_secondary_cpu(void);
 /* Set up the xenheap: up to 1GB of contiguous, always-mapped memory.
  * Base must be 32MB aligned and size a multiple of 32MB. */
 extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns);
diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
index 08bdce3..4c62725 100644
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -122,7 +122,7 @@ void p2m_altp2m_check(struct vcpu *v, uint16_t idx)
 void p2m_vmid_allocator_init(void);
 
 /* Second stage paging setup, to be called on all CPUs */
-void __cpuinit setup_virt_paging(void);
+void setup_virt_paging(void);
 
 /* Init the datastructures for later use by the p2m code */
 int p2m_init(struct domain *d);
diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h
index f99d6e8..5b9a31d 100644
--- a/xen/include/asm-arm/time.h
+++ b/xen/include/asm-arm/time.h
@@ -32,7 +32,7 @@ extern uint32_t timer_dt_clock_frequency;
 unsigned int timer_get_irq(enum timer_ppi ppi);
 
 /* Set up the timer interrupt on this CPU */
-extern void __cpuinit init_timer_interrupt(void);
+extern void init_timer_interrupt(void);
 
 /* Counter value at boot time */
 extern uint64_t boot_count;
diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index 89a590e..9b4b6ef 100644
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -84,8 +84,6 @@
 #define mk_unsigned_long(x) x
 #endif /* !__ASSEMBLY__ */
 
-#define __cpuinit
-
 #ifdef FLASK_ENABLE
 #define XSM_MAGIC 0xf97cff8c
 /* Maintain statistics on the access vector cache */
-- 
2.1.4

[PATCH 4/6] xen: Drop empty __devinitdata annotation

[Andrew Cooper]

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>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 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

[PATCH 5/6] xen: Drop empty __devinit annotation, and aliased __pminit

[Andrew Cooper]

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

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 xen/arch/x86/apic.c         |  6 +++---
 xen/arch/x86/cpu/amd.c      |  6 +++---
 xen/arch/x86/cpu/intel.c    | 10 +++++-----
 xen/arch/x86/i8259.c        |  2 +-
 xen/arch/x86/mpparse.c      |  8 ++++----
 xen/arch/x86/nmi.c          | 12 +++++-------
 xen/arch/x86/setup.c        |  2 +-
 xen/arch/x86/traps.c        |  2 +-
 xen/arch/x86/x86_64/traps.c |  2 +-
 xen/include/xen/init.h      |  2 --
 10 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 67733c0..b9601ad 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -521,7 +521,7 @@ static void resume_x2apic(void)
         free_ioapic_entries(ioapic_entries);
 }
 
-void __devinit setup_local_APIC(void)
+void setup_local_APIC(void)
 {
     unsigned long oldvalue, value, ver, maxlvt;
     int i, j;
@@ -1087,7 +1087,7 @@ static void __setup_APIC_LVTT(unsigned int clocks)
     apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR);
 }
 
-static void __devinit setup_APIC_timer(void)
+static void setup_APIC_timer(void)
 {
     unsigned long flags;
     local_irq_save(flags);
@@ -1199,7 +1199,7 @@ void __init setup_boot_APIC_clock(void)
     local_irq_restore(flags);
 }
 
-void __devinit setup_secondary_APIC_clock(void)
+void setup_secondary_APIC_clock(void)
 {
     setup_APIC_timer();
 }
diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 3ebcc86..c51aa16 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -134,7 +134,7 @@ static const struct cpuidmask *__init noinline get_cpuidmask(const char *opt)
  *
  * The processor revision string parameter has precedene.
  */
-static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
+static void set_cpuidmask(const struct cpuinfo_x86 *c)
 {
 	static unsigned int feat_ecx, feat_edx;
 	static unsigned int extfeat_ecx, extfeat_edx;
@@ -383,7 +383,7 @@ static void check_syscfg_dram_mod_en(void)
 	wrmsrl(MSR_K8_SYSCFG, syscfg);
 }
 
-static void __devinit amd_get_topology(struct cpuinfo_x86 *c)
+static void amd_get_topology(struct cpuinfo_x86 *c)
 {
         int cpu;
         unsigned bits;
@@ -424,7 +424,7 @@ static void __devinit amd_get_topology(struct cpuinfo_x86 *c)
                                                          c->cpu_core_id);
 }
 
-static void __devinit init_amd(struct cpuinfo_x86 *c)
+static void init_amd(struct cpuinfo_x86 *c)
 {
 	u32 l, h;
 
diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index c00657e..b318215 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -49,7 +49,7 @@ void set_cpuid_faulting(bool_t enable)
  * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to
  * 'rev down' to E8400, you can set these values in these Xen boot parameters.
  */
-static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
+static void set_cpuidmask(const struct cpuinfo_x86 *c)
 {
 	static unsigned int msr_basic, msr_ext, msr_xsave;
 	static enum { not_parsed, no_mask, set_mask } status;
@@ -156,7 +156,7 @@ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
 	}
 }
 
-void __devinit early_intel_workaround(struct cpuinfo_x86 *c)
+void early_intel_workaround(struct cpuinfo_x86 *c)
 {
 	if (c->x86_vendor != X86_VENDOR_INTEL)
 		return;
@@ -193,7 +193,7 @@ void __devinit early_intel_workaround(struct cpuinfo_x86 *c)
  * Xeon 7400 erratum AAI65 (and further newer Xeons)
  * MONITOR/MWAIT may have excessive false wakeups
  */
-static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
+static void Intel_errata_workarounds(struct cpuinfo_x86 *c)
 {
 	unsigned long lo, hi;
 
@@ -216,7 +216,7 @@ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c)
 /*
  * find out the number of processor cores on the die
  */
-static int __devinit num_cpu_cores(struct cpuinfo_x86 *c)
+static int num_cpu_cores(struct cpuinfo_x86 *c)
 {
 	unsigned int eax, ebx, ecx, edx;
 
@@ -231,7 +231,7 @@ static int __devinit num_cpu_cores(struct cpuinfo_x86 *c)
 		return 1;
 }
 
-static void __devinit init_intel(struct cpuinfo_x86 *c)
+static void init_intel(struct cpuinfo_x86 *c)
 {
 	unsigned int l2 = 0;
 
diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index c2c9005..aa266c2 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -283,7 +283,7 @@ int i8259A_suspend(void)
     return 0;
 }
 
-void __devinit init_8259A(int auto_eoi)
+void init_8259A(int auto_eoi)
 {
     unsigned long flags;
 
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index 497a4e9..22b11fb 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -124,8 +124,8 @@ static int __init mpf_checksum(unsigned char *mp, int len)
 }
 
 /* Return xen's logical cpu_id of the new added cpu or <0 if error */
-static int __devinit MP_processor_info_x(struct mpc_config_processor *m,
-					 u32 apicid, bool_t hotplug)
+static int MP_processor_info_x(struct mpc_config_processor *m,
+			       u32 apicid, bool_t hotplug)
 {
  	int ver, cpu = 0;
  	
@@ -190,7 +190,7 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m,
 	return cpu;
 }
 
-static int __devinit MP_processor_info(struct mpc_config_processor *m)
+static int MP_processor_info(struct mpc_config_processor *m)
 {
 	return MP_processor_info_x(m, m->mpc_apicid, 0);
 }
@@ -787,7 +787,7 @@ void __init mp_register_lapic_address (
 }
 
 
-int __devinit mp_register_lapic (
+int mp_register_lapic (
 	u32			id,
 	bool_t			enabled,
 	bool_t			hotplug)
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 7520454..b1195a1 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -254,14 +254,12 @@ void release_lapic_nmi(void)
         enable_lapic_nmi_watchdog();
 }
 
-#define __pminit __devinit
-
 /*
  * Activate the NMI watchdog via the local APIC.
  * Original code written by Keith Owens.
  */
 
-static void __pminit clear_msr_range(unsigned int base, unsigned int n)
+static void clear_msr_range(unsigned int base, unsigned int n)
 {
     unsigned int i;
 
@@ -279,7 +277,7 @@ static inline void write_watchdog_counter(const char *descr)
     wrmsrl(nmi_perfctr_msr, 0 - count);
 }
 
-static void __pminit setup_k7_watchdog(void)
+static void setup_k7_watchdog(void)
 {
     unsigned int evntsel;
 
@@ -300,7 +298,7 @@ static void __pminit setup_k7_watchdog(void)
     wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);
 }
 
-static void __pminit setup_p6_watchdog(unsigned counter)
+static void setup_p6_watchdog(unsigned counter)
 {
     unsigned int evntsel;
 
@@ -321,7 +319,7 @@ static void __pminit setup_p6_watchdog(unsigned counter)
     wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0);
 }
 
-static int __pminit setup_p4_watchdog(void)
+static int setup_p4_watchdog(void)
 {
     uint64_t misc_enable;
 
@@ -359,7 +357,7 @@ static int __pminit setup_p4_watchdog(void)
     return 1;
 }
 
-void __pminit setup_apic_nmi_watchdog(void)
+void setup_apic_nmi_watchdog(void)
 {
     if ( nmi_watchdog == NMI_NONE )
         return;
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 6714473..76c7b0f 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -195,7 +195,7 @@ static void __init init_idle_domain(void)
     this_cpu(curr_vcpu) = current;
 }
 
-void __devinit srat_detect_node(int cpu)
+void srat_detect_node(int cpu)
 {
     nodeid_t node;
     u32 apicid = x86_cpu_to_apicid[cpu];
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index d29f828..e103834 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -3616,7 +3616,7 @@ void load_TR(void)
         : "=m" (old_gdt) : "rm" (TSS_ENTRY << 3), "m" (tss_gdt) : "memory" );
 }
 
-void __devinit percpu_traps_init(void)
+void percpu_traps_init(void)
 {
     subarch_percpu_traps_init();
 
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index b7c2759..26e2dd7 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -371,7 +371,7 @@ DEFINE_PER_CPU(struct stubs, stubs);
 void lstar_enter(void);
 void cstar_enter(void);
 
-void __devinit subarch_percpu_traps_init(void)
+void subarch_percpu_traps_init(void)
 {
     unsigned long stack_bottom = get_stack_bottom();
     unsigned long stub_va = this_cpu(stubs.addr);
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index e411736..17fe550 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -118,11 +118,9 @@ extern struct kernel_param __setup_start, __setup_end;
 #endif /* __ASSEMBLY__ */
 
 #ifdef CONFIG_HOTPLUG
-#define __devinit
 #define __devexit
 #define __devexitdata
 #else
-#define __devinit __init
 #define __devexit __exit
 #define __devexitdata __exitdata
 #endif
-- 
2.1.4

[PATCH 6/6] xen: Drop unused __devexit{, data} and CONFIG_HOTPLUG

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 xen/include/asm-x86/config.h | 1 -
 xen/include/xen/init.h       | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 52f7ca8..fee24c5 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -44,7 +44,6 @@
 #define CONFIG_VGA 1
 #define CONFIG_VIDEO 1
 
-#define CONFIG_HOTPLUG 1
 #define CONFIG_HOTPLUG_CPU 1
 
 #define CONFIG_XENOPROF 1
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 17fe550..7072013 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -117,14 +117,6 @@ extern struct kernel_param __setup_start, __setup_end;
 
 #endif /* __ASSEMBLY__ */
 
-#ifdef CONFIG_HOTPLUG
-#define __devexit
-#define __devexitdata
-#else
-#define __devexit __exit
-#define __devexitdata __exitdata
-#endif
-
 #ifdef CONFIG_LATE_HWDOM
 #define __hwdom_init
 #define __hwdom_initdata  __read_mostly
-- 
2.1.4

Re: [PATCH 0/6] xen: Drop unused or empty annotations

[Jan Beulich]

>>> On 27.11.15 at 20:58, <andrew.cooper3@citrix.com> wrote:
> No resulting change on any architecture.
> 
> Andrew Cooper (6):
>   xen: Drop unused fastcall annotation
>   xen: Drop empty __cpuinitdata annotation
>   xen: Drop empty __cpuinit annotation
>   xen: Drop empty __devinitdata annotation
>   xen: Drop empty __devinit annotation, and aliased __pminit
>   xen: Drop unused __devexit{,data} and CONFIG_HOTPLUG

Reviewed-by: Jan Beulich <jbeulich@suse.com>

Albeit I would have wished for this to have been a little less
mechanical (which is also the reason why I've been thinking doing
this gradually would be the better approach, as then doing
further adjustments - types, const-ness, conversion to __init -
would come with just one modification).

Jan

Re: [PATCH 3/6] xen: Drop empty __cpuinit annotation

[Julien Grall]

Hi Andrew,

On 27/11/15 19:58, Andrew Cooper wrote:
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

It's worth to note that on ARM we don't yet support CPU hotplug so it
may be possible to define __cpuinit as __init and save few KB.

Regards,

-- 
Julien Grall

Re: [PATCH 3/6] xen: Drop empty __cpuinit annotation

[Ian Campbell]

On Tue, 2015-12-15 at 05:50 -0700, Jan Beulich wrote:
> > > > On 27.11.15 at 20:58, <andrew.cooper3@citrix.com> wrote:
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > ---
> > CC: Jan Beulich <JBeulich@suse.com>
> > CC: Ian Campbell <ian.campbell@citrix.com>
> > CC: Stefano Stabellini <stefano.stabellini@citrix.com>
> 
> Would one of you ack (or otherwise) the ARM bits here please?

Acked-by: Ian Campbell <ian.campbell@citrix.com>

On the basis that it was empty before.