[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-da482474b8396e1a099c37ffc6541b78775aedb4@git.kernel.org>
Date: Wed, 27 Jan 2010 08:18:52 GMT
From: tip-bot for Russ Anderson <rja@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, rja@....com, hpa@...or.com,
mingo@...hat.com, dnelson@...hat.com, tglx@...utronix.de
Subject: [tip:x86/urgent] x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
Commit-ID: da482474b8396e1a099c37ffc6541b78775aedb4
Gitweb: http://git.kernel.org/tip/da482474b8396e1a099c37ffc6541b78775aedb4
Author: Russ Anderson <rja@....com>
AuthorDate: Tue, 26 Jan 2010 20:37:22 -0600
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Tue, 26 Jan 2010 23:52:38 -0800
x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
Pass the number of minors when unregistering MSR and CPUID drivers.
Reported-by: Dean Nelson <dnelson@...hat.com>
Signed-off-by: Dean Nelson <dnelson@...hat.com>
LKML-Reference: <20100127023722.GA22305@....com>
Signed-off-by: Russ Anderson <rja@....com>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
arch/x86/kernel/cpuid.c | 2 +-
arch/x86/kernel/msr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index cb27fd6..83e5e62 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -229,7 +229,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);
}
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4bd93c9..206735a 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -285,7 +285,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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists