redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] cpu hotplug: use hotplug version of registration in late inits 

Use hotplug version of register_cpu_notifier in late init functions.

Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Chandra Seetharaman 2006-07-30 03:03:37 -07:00 committed by Linus Torvalds
parent 7c7165c908
commit be6b5a3505
7 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/cpu/intel_cacheinfo.c
View File

@ -759,7 +759,7 @@ static int __cpuinit cache_sysfs_init(void)
if (num_cache_leaves == 0)
return 0;
register_cpu_notifier(&cacheinfo_cpu_notifier);
register_hotcpu_notifier(&cacheinfo_cpu_notifier);
for_each_online_cpu(i) {
cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,

13
arch/ia64/kernel/palinfo.c
View File

@ -958,9 +958,9 @@ remove_palinfo_proc_entries(unsigned int hcpu)
}
}
static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
#ifdef CONFIG_HOTPLUG_CPU
static int palinfo_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int hotcpu = (unsigned long)hcpu;
@ -968,20 +968,19 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
case CPU_ONLINE:
create_palinfo_proc_entries(hotcpu);
break;
#ifdef CONFIG_HOTPLUG_CPU
case CPU_DEAD:
remove_palinfo_proc_entries(hotcpu);
break;
#endif
}
return NOTIFY_OK;
}
static struct notifier_block __cpuinitdata palinfo_cpu_notifier =
static struct notifier_block palinfo_cpu_notifier =
{
.notifier_call = palinfo_cpu_callback,
.priority = 0,
};
#endif
static int __init
palinfo_init(void)
@ -1020,7 +1019,7 @@ palinfo_exit(void)
/*
* Unregister from cpu notifier callbacks
*/
unregister_cpu_notifier(&palinfo_cpu_notifier);
unregister_hotcpu_notifier(&palinfo_cpu_notifier);
}
module_init(palinfo_init);

2
arch/ia64/kernel/topology.c
View File

@ -435,7 +435,7 @@ static int __cpuinit cache_sysfs_init(void)
(void *)(long)i);
}
register_cpu_notifier(&cache_cpu_notifier);
register_hotcpu_notifier(&cache_cpu_notifier);
return 0;
}

10
arch/s390/appldata/appldata_base.c
View File

@ -617,7 +617,8 @@ appldata_offline_cpu(int cpu)
spin_unlock(&appldata_timer_lock);
}
static int __cpuinit
#ifdef CONFIG_HOTPLUG_CPU
static int
appldata_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
@ -625,20 +626,19 @@ appldata_cpu_notify(struct notifier_block *self,
case CPU_ONLINE:
appldata_online_cpu((long) hcpu);
break;
#ifdef CONFIG_HOTPLUG_CPU
case CPU_DEAD:
appldata_offline_cpu((long) hcpu);
break;
#endif
default:
break;
}
return NOTIFY_OK;
}
static struct notifier_block __devinitdata appldata_nb = {
static struct notifier_block appldata_nb = {
.notifier_call = appldata_cpu_notify,
};
#endif
/*
* appldata_init()
@ -662,7 +662,7 @@ static int __init appldata_init(void)
appldata_online_cpu(i);
/* Register cpu hotplug notifier */
register_cpu_notifier(&appldata_nb);
register_hotcpu_notifier(&appldata_nb);
appldata_sysctl_header = register_sysctl_table(appldata_dir_table, 1);
#ifdef MODULE

12
arch/x86_64/kernel/mce.c
View File

@ -615,7 +615,7 @@ static __cpuinit int mce_create_device(unsigned int cpu)
}
#ifdef CONFIG_HOTPLUG_CPU
static __cpuinit void mce_remove_device(unsigned int cpu)
static void mce_remove_device(unsigned int cpu)
{
int i;
@ -626,10 +626,9 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_check_interval);
sysdev_unregister(&per_cpu(device_mce,cpu));
}
#endif
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
static __cpuinit int
static int
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@ -638,18 +637,17 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
case CPU_ONLINE:
mce_create_device(cpu);
break;
#ifdef CONFIG_HOTPLUG_CPU
case CPU_DEAD:
mce_remove_device(cpu);
break;
#endif
}
return NOTIFY_OK;
}
static struct notifier_block __cpuinitdata mce_cpu_notifier = {
static struct notifier_block mce_cpu_notifier = {
.notifier_call = mce_cpu_callback,
};
#endif
static __init int mce_init_device(void)
{
@ -664,7 +662,7 @@ static __init int mce_init_device(void)
mce_create_device(i);
}
register_cpu_notifier(&mce_cpu_notifier);
register_hotcpu_notifier(&mce_cpu_notifier);
misc_register(&mce_log_device);
return err;
}

19
arch/x86_64/kernel/mce_amd.c
View File

@ -558,7 +558,7 @@ out:
* of shared sysfs dir/files, and rest of the cores will be symlinked to it.
*/
static __cpuinit void deallocate_threshold_block(unsigned int cpu,
static void deallocate_threshold_block(unsigned int cpu,
unsigned int bank)
{
struct threshold_block *pos = NULL;
@ -578,7 +578,7 @@ static __cpuinit void deallocate_threshold_block(unsigned int cpu,
per_cpu(threshold_banks, cpu)[bank]->blocks = NULL;
}
static __cpuinit void threshold_remove_bank(unsigned int cpu, int bank)
static void threshold_remove_bank(unsigned int cpu, int bank)
{
int i = 0;
struct threshold_bank *b;
@ -618,7 +618,7 @@ free_out:
per_cpu(threshold_banks, cpu)[bank] = NULL;
}
static __cpuinit void threshold_remove_device(unsigned int cpu)
static void threshold_remove_device(unsigned int cpu)
{
unsigned int bank;
@ -629,14 +629,8 @@ static __cpuinit void threshold_remove_device(unsigned int cpu)
}
}
#else /* !CONFIG_HOTPLUG_CPU */
static void threshold_remove_device(unsigned int cpu)
{
}
#endif
/* get notified when a cpu comes on/off */
static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb,
static int threshold_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
/* cpu was unsigned int to begin with */
@ -659,9 +653,10 @@ static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
static struct notifier_block threshold_cpu_notifier __cpuinitdata = {
static struct notifier_block threshold_cpu_notifier = {
.notifier_call = threshold_cpu_callback,
};
#endif /* CONFIG_HOTPLUG_CPU */
static __init int threshold_init_device(void)
{
@ -673,7 +668,7 @@ static __init int threshold_init_device(void)
if (err)
return err;
}
register_cpu_notifier(&threshold_cpu_notifier);
register_hotcpu_notifier(&threshold_cpu_notifier);
return 0;
}

2
drivers/base/topology.c
View File

@ -139,7 +139,7 @@ static int __cpuinit topology_sysfs_init(void)
(void *)(long)i);
}
register_cpu_notifier(&topology_cpu_notifier);
register_hotcpu_notifier(&topology_cpu_notifier);
return 0;
}