mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 16:54:21 +00:00 
			
		
		
		
	[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>
This commit is contained in:
		
							parent
							
								
									cea6a4ba8a
								
							
						
					
					
						commit
						8c78f3075d
					
				
					 7 changed files with 13 additions and 13 deletions
				
			
		|  | @ -278,7 +278,7 @@ static void unregister_cpu_online(unsigned int 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 int cpu = (unsigned int)(long)hcpu; | ||||
|  | @ -296,7 +296,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self, | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata sysfs_cpu_nb = { | ||||
| static struct notifier_block __cpuinitdata sysfs_cpu_nb = { | ||||
| 	.notifier_call	= sysfs_cpu_notify, | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -835,7 +835,7 @@ static void migrate_hrtimers(int 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) | ||||
| { | ||||
| 	long cpu = (long)hcpu; | ||||
|  | @ -859,7 +859,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata hrtimers_nb = { | ||||
| static struct notifier_block __cpuinitdata hrtimers_nb = { | ||||
| 	.notifier_call = hrtimer_cpu_notify, | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -548,7 +548,7 @@ static void __devinit rcu_online_cpu(int cpu) | |||
| 	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) | ||||
| { | ||||
| 	long cpu = (long)hcpu; | ||||
|  | @ -565,7 +565,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self, | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata rcu_nb = { | ||||
| static struct notifier_block __cpuinitdata rcu_nb = { | ||||
| 	.notifier_call	= rcu_cpu_notify, | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -547,7 +547,7 @@ static void takeover_tasklets(unsigned int 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, | ||||
| 				  void *hcpu) | ||||
| { | ||||
|  | @ -587,7 +587,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata cpu_nfb = { | ||||
| static struct notifier_block __cpuinitdata cpu_nfb = { | ||||
| 	.notifier_call = cpu_callback | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu) | |||
| /*
 | ||||
|  * 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) | ||||
| { | ||||
| 	int hotcpu = (unsigned long)hcpu; | ||||
|  | @ -142,7 +142,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata cpu_nfb = { | ||||
| static struct notifier_block __cpuinitdata cpu_nfb = { | ||||
| 	.notifier_call = cpu_callback | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -1688,7 +1688,7 @@ static void __devinit migrate_timers(int cpu) | |||
| } | ||||
| #endif /* CONFIG_HOTPLUG_CPU */ | ||||
| 
 | ||||
| static int __devinit timer_cpu_notify(struct notifier_block *self, | ||||
| static int __cpuinit timer_cpu_notify(struct notifier_block *self, | ||||
| 				unsigned long action, void *hcpu) | ||||
| { | ||||
| 	long cpu = (long)hcpu; | ||||
|  | @ -1708,7 +1708,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self, | |||
| 	return NOTIFY_OK; | ||||
| } | ||||
| 
 | ||||
| static struct notifier_block __devinitdata timers_nb = { | ||||
| static struct notifier_block __cpuinitdata timers_nb = { | ||||
| 	.notifier_call	= timer_cpu_notify, | ||||
| }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -1106,7 +1106,7 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) | |||
| 
 | ||||
| #endif | ||||
| 
 | ||||
| static int __devinit cpuup_callback(struct notifier_block *nfb, | ||||
| static int __cpuinit cpuup_callback(struct notifier_block *nfb, | ||||
| 				    unsigned long action, void *hcpu) | ||||
| { | ||||
| 	long cpu = (long)hcpu; | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Chandra Seetharaman
						Chandra Seetharaman