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

Commit 8c78f307 authored Jul 30, 2006 by Chandra Seetharaman Committed by Linus Torvalds Jul 31, 2006

[PATCH] cpu hotplug: replace devinit* with cpuinit* for cpu notifications



Few of the callback functions and notifier blocks that are associated with cpu
notifications incorrectly have __devinit and __devinitdata.  They should be
__cpuinit and __cpuinitdata instead.

It makes no functional difference but wastes text area when CONFIG_HOTPLUG is
enabled and CONFIG_HOTPLUG_CPU is not.

This patch fixes all those instances.

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent cea6a4ba

arch/powerpc/kernel/sysfs.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -278,7 +278,7 @@ static void unregister_cpu_online(unsigned int cpu)
	}		}
	#endif /* CONFIG_HOTPLUG_CPU */		#endif /* CONFIG_HOTPLUG_CPU */

	static int __devinit sysfs_cpu_notify(struct notifier_block *self,		static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
	unsigned long action, void *hcpu)		unsigned long action, void *hcpu)
	{		{
	unsigned int cpu = (unsigned int)(long)hcpu;		unsigned int cpu = (unsigned int)(long)hcpu;
	@@ -296,7 +296,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self,
	return NOTIFY_OK;		return NOTIFY_OK;
	}		}

	static struct notifier_block __devinitdata sysfs_cpu_nb = {		static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
	.notifier_call = sysfs_cpu_notify,		.notifier_call = sysfs_cpu_notify,
	};		};

kernel/hrtimer.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -835,7 +835,7 @@ static void migrate_hrtimers(int cpu)
	}		}
	#endif /* CONFIG_HOTPLUG_CPU */		#endif /* CONFIG_HOTPLUG_CPU */

	static int __devinit hrtimer_cpu_notify(struct notifier_block *self,		static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
	unsigned long action, void *hcpu)		unsigned long action, void *hcpu)
	{		{
	long cpu = (long)hcpu;		long cpu = (long)hcpu;
	@@ -859,7 +859,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self,
	return NOTIFY_OK;		return NOTIFY_OK;
	}		}

	static struct notifier_block __devinitdata hrtimers_nb = {		static struct notifier_block __cpuinitdata hrtimers_nb = {
	.notifier_call = hrtimer_cpu_notify,		.notifier_call = hrtimer_cpu_notify,
	};		};

kernel/rcupdate.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -548,7 +548,7 @@ static void __devinit rcu_online_cpu(int cpu)
	tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);		tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
	}		}

	static int __devinit rcu_cpu_notify(struct notifier_block *self,		static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
	unsigned long action, void *hcpu)		unsigned long action, void *hcpu)
	{		{
	long cpu = (long)hcpu;		long cpu = (long)hcpu;
	@@ -565,7 +565,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self,
	return NOTIFY_OK;		return NOTIFY_OK;
	}		}

	static struct notifier_block __devinitdata rcu_nb = {		static struct notifier_block __cpuinitdata rcu_nb = {
	.notifier_call = rcu_cpu_notify,		.notifier_call = rcu_cpu_notify,
	};		};

kernel/softirq.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -547,7 +547,7 @@ static void takeover_tasklets(unsigned int cpu)
	}		}
	#endif /* CONFIG_HOTPLUG_CPU */		#endif /* CONFIG_HOTPLUG_CPU */

	static int __devinit cpu_callback(struct notifier_block *nfb,		static int __cpuinit cpu_callback(struct notifier_block *nfb,
	unsigned long action,		unsigned long action,
	void *hcpu)		void *hcpu)
	{		{
	@@ -587,7 +587,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
	return NOTIFY_OK;		return NOTIFY_OK;
	}		}

	static struct notifier_block __devinitdata cpu_nfb = {		static struct notifier_block __cpuinitdata cpu_nfb = {
	.notifier_call = cpu_callback		.notifier_call = cpu_callback
	};		};

kernel/softlockup.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu)
	/*		/*
	* Create/destroy watchdog threads as CPUs come and go:		* Create/destroy watchdog threads as CPUs come and go:
	*/		*/
	static int __devinit		static int __cpuinit
	cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)		cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)
	{		{
	int hotcpu = (unsigned long)hcpu;		int hotcpu = (unsigned long)hcpu;
	@@ -142,7 +142,7 @@ cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)
	return NOTIFY_OK;		return NOTIFY_OK;
	}		}

	static struct notifier_block __devinitdata cpu_nfb = {		static struct notifier_block __cpuinitdata cpu_nfb = {
	.notifier_call = cpu_callback		.notifier_call = cpu_callback
	};		};