another .32 patch needed

diff --git a/review-2.6.32/series b/review-2.6.32/series
index 94bc219db89ff6f70d02ab57008b14eb184d34ba..7f77004753592854ba09be142df3eb81cfb84449 100644 (file)
--- a/review-2.6.32/series
+++ b/review-2.6.32/series
@@ -98,3 +98,4 @@ x86-reenable-tsc-sync-check-at-boot-even-with-nonstop_tsc.patch
 acpi-enable-c2-and-turbo-mode-on-nehalem-notebooks-on-a-c.patch
 iwlwifi-fix-throughput-stall-issue-in-ht-mode-for-5000.patch
 fnctl-f_modown-should-call-write_lock_irqsave-restore.patch
+x86-msr-cpuid-pass-the-number-of-minors-when-unregistering-msr-and-cpuid-drivers.patch

diff --git a/review-2.6.32/x86-msr-cpuid-pass-the-number-of-minors-when-unregistering-msr-and-cpuid-drivers.patch b/review-2.6.32/x86-msr-cpuid-pass-the-number-of-minors-when-unregistering-msr-and-cpuid-drivers.patch
new file mode 100644 (file)
index 0000000..3e261e0
--- /dev/null
+++ b/review-2.6.32/x86-msr-cpuid-pass-the-number-of-minors-when-unregistering-msr-and-cpuid-drivers.patch
@@ -0,0 +1,45 @@
+From da482474b8396e1a099c37ffc6541b78775aedb4 Mon Sep 17 00:00:00 2001
+From: Russ Anderson <rja@sgi.com>
+Date: Tue, 26 Jan 2010 20:37:22 -0600
+Subject: x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
+
+From: Russ Anderson <rja@sgi.com>
+
+commit da482474b8396e1a099c37ffc6541b78775aedb4 upstream.
+
+Pass the number of minors when unregistering MSR and CPUID drivers.
+
+Reported-by: Dean Nelson <dnelson@redhat.com>
+Signed-off-by: Dean Nelson <dnelson@redhat.com>
+LKML-Reference: <20100127023722.GA22305@sgi.com>
+Signed-off-by: Russ Anderson <rja@sgi.com>
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/kernel/cpuid.c |    2 +-
+ arch/x86/kernel/msr.c   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/kernel/cpuid.c
++++ b/arch/x86/kernel/cpuid.c
+@@ -234,7 +234,7 @@ static void __exit cpuid_exit(void)
+       for_each_online_cpu(cpu)
+               cpuid_device_destroy(cpu);
+       class_destroy(cpuid_class);
+-      unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
++      __unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");
+       unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);
+ }
+ 
+--- a/arch/x86/kernel/msr.c
++++ b/arch/x86/kernel/msr.c
+@@ -290,7 +290,7 @@ static void __exit msr_exit(void)
+       for_each_online_cpu(cpu)
+               msr_device_destroy(cpu);
+       class_destroy(msr_class);
+-      unregister_chrdev(MSR_MAJOR, "cpu/msr");
++      __unregister_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr");
+       unregister_hotcpu_notifier(&msr_class_cpu_notifier);
+ }
+