summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/cpuid.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-10 13:08:37 +0200
committerPaul Mackerras <paulus@samba.org>2007-05-10 13:08:37 +0200
commit2ecf042ef530dd0943e41d84b6344f507941af3e (patch)
tree73100361dd74e3f80f14c7c81ba4675948983f44 /arch/i386/kernel/cpuid.c
parent[POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning (diff)
parentMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff)
downloadlinux-2ecf042ef530dd0943e41d84b6344f507941af3e.tar.xz
linux-2ecf042ef530dd0943e41d84b6344f507941af3e.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/i386/kernel/cpuid.c')
-rw-r--r--arch/i386/kernel/cpuid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index eeae0d992337..5c2faa10e9fa 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -169,9 +169,11 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long ac
switch (action) {
case CPU_ONLINE:
+ case CPU_ONLINE_FROZEN:
cpuid_device_create(cpu);
break;
case CPU_DEAD:
+ case CPU_DEAD_FROZEN:
device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
break;
}