diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /arch/powerpc/kernel/sysfs.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index cae39d9dfe48..68991c2d4a1b 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
| @@ -342,10 +342,12 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self, | |||
| 342 | 342 | ||
| 343 | switch (action) { | 343 | switch (action) { |
| 344 | case CPU_ONLINE: | 344 | case CPU_ONLINE: |
| 345 | case CPU_ONLINE_FROZEN: | ||
| 345 | register_cpu_online(cpu); | 346 | register_cpu_online(cpu); |
| 346 | break; | 347 | break; |
| 347 | #ifdef CONFIG_HOTPLUG_CPU | 348 | #ifdef CONFIG_HOTPLUG_CPU |
| 348 | case CPU_DEAD: | 349 | case CPU_DEAD: |
| 350 | case CPU_DEAD_FROZEN: | ||
| 349 | unregister_cpu_online(cpu); | 351 | unregister_cpu_online(cpu); |
| 350 | break; | 352 | break; |
| 351 | #endif | 353 | #endif |