Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccce9bb8 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Tony Luck
Browse files

[IA64] Delete __cpuinit usage from all ia64 users 

The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications.  For example, the fix in
commit 5e427ec2 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.

After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out.  Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.

This removes all the ia64 uses of the __cpuinit macros.

[1] https://lkml.org/lkml/2013/5/20/589



Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 69cbc046

arch/ia64/kernel/acpi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -807,7 +807,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) 
 *  ACPI based hotplug CPU support

 *  ACPI based hotplug CPU support

 */

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

#ifdef CONFIG_ACPI_HOTPLUG_CPU

static __cpuinit

static

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

{

#ifdef CONFIG_ACPI_NUMA

#ifdef CONFIG_ACPI_NUMA
@@ -882,7 +882,7 @@ __init void prefill_possible_map(void) 
		set_cpu_possible(i, true);

		set_cpu_possible(i, true);

}

}





static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)

static int _acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

	union acpi_object *obj;

arch/ia64/kernel/err_inject.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -225,17 +225,17 @@ static struct attribute_group err_inject_attr_group = { 
	.name = "err_inject"

	.name = "err_inject"

};

};

/* Add/Remove err_inject interface for CPU device */

/* Add/Remove err_inject interface for CPU device */

static int __cpuinit err_inject_add_dev(struct device * sys_dev)

static int err_inject_add_dev(struct device *sys_dev)

{

{

	return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);

	return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);

}

}





static int __cpuinit err_inject_remove_dev(struct device * sys_dev)

static int err_inject_remove_dev(struct device *sys_dev)

{

{

	sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);

	sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);

	return 0;

	return 0;

}

}

static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,

static int err_inject_cpu_callback(struct notifier_block *nfb,

		unsigned long action, void *hcpu)

		unsigned long action, void *hcpu)

{

{

	unsigned int cpu = (unsigned long)hcpu;

	unsigned int cpu = (unsigned long)hcpu;
@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

	return NOTIFY_OK;

}

}





static struct notifier_block __cpuinitdata err_inject_cpu_notifier =

static struct notifier_block err_inject_cpu_notifier =

{

{

	.notifier_call = err_inject_cpu_callback,

	.notifier_call = err_inject_cpu_callback,

};

};

arch/ia64/kernel/mca.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -631,7 +631,7 @@ ia64_mca_register_cpev (int cpev) 
 * Outputs

 * Outputs

 *	None

 *	None

 */

 */

void __cpuinit

void

ia64_mca_cmc_vector_setup (void)

ia64_mca_cmc_vector_setup (void)

{

{

	cmcv_reg_t	cmcv;

	cmcv_reg_t	cmcv;
@@ -1814,7 +1814,7 @@ static struct irqaction mca_cpep_irqaction = { 
 * format most of the fields.

 * format most of the fields.

 */

 */





static void __cpuinit

static void

format_mca_init_stack(void *mca_data, unsigned long offset,

format_mca_init_stack(void *mca_data, unsigned long offset,

		const char *type, int cpu)

		const char *type, int cpu)

{

{
@@ -1844,7 +1844,7 @@ static void * __init_refok mca_bootmem(void) 
}

}





/* Do per-CPU MCA-related initialization.  */

/* Do per-CPU MCA-related initialization.  */

void __cpuinit

void

ia64_mca_cpu_init(void *cpu_data)

ia64_mca_cpu_init(void *cpu_data)

{

{

	void *pal_vaddr;

	void *pal_vaddr;
@@ -1896,7 +1896,7 @@ ia64_mca_cpu_init(void *cpu_data) 
							      PAGE_KERNEL));

							      PAGE_KERNEL));

}

}





static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)

static void ia64_mca_cmc_vector_adjust(void *dummy)

{

{

	unsigned long flags;

	unsigned long flags;
@@ -1906,7 +1906,7 @@ static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy) 
	local_irq_restore(flags);

	local_irq_restore(flags);

}

}





static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,

static int mca_cpu_callback(struct notifier_block *nfb,

				      unsigned long action,

				      unsigned long action,

				      void *hcpu)

				      void *hcpu)

{

{
@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

	return NOTIFY_OK;

}

}





static struct notifier_block mca_cpu_notifier __cpuinitdata = {

static struct notifier_block mca_cpu_notifier = {

	.notifier_call = mca_cpu_callback

	.notifier_call = mca_cpu_callback

};

};

arch/ia64/kernel/numa.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(cpu_to_node_map); 
cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;

cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;

EXPORT_SYMBOL(node_to_cpu_mask);

EXPORT_SYMBOL(node_to_cpu_mask);





void __cpuinit map_cpu_to_node(int cpu, int nid)

void map_cpu_to_node(int cpu, int nid)

{

{

	int oldnid;

	int oldnid;

	if (nid < 0) { /* just initialize by zero */

	if (nid < 0) { /* just initialize by zero */
@@ -51,7 +51,7 @@ void __cpuinit map_cpu_to_node(int cpu, int nid) 
	return;

	return;

}

}





void __cpuinit unmap_cpu_from_node(int cpu, int nid)

void unmap_cpu_from_node(int cpu, int nid)

{

{

	WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));

	WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));

	WARN_ON(cpu_to_node_map[cpu] != nid);

	WARN_ON(cpu_to_node_map[cpu] != nid);

arch/ia64/kernel/palinfo.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -932,7 +932,7 @@ static const struct file_operations proc_palinfo_fops = { 
	.release	= single_release,

	.release	= single_release,

};

};





static void __cpuinit

static void

create_palinfo_proc_entries(unsigned int cpu)

create_palinfo_proc_entries(unsigned int cpu)

{

{

	pal_func_cpu_u_t f;

	pal_func_cpu_u_t f;
@@ -962,7 +962,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) 
	remove_proc_subtree(cpustr, palinfo_dir);

	remove_proc_subtree(cpustr, palinfo_dir);

}

}





static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,

static int palinfo_cpu_callback(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

					unsigned long action, void *hcpu)

{

{

	unsigned int hotcpu = (unsigned long)hcpu;

	unsigned int hotcpu = (unsigned long)hcpu;