diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-05-28 11:41:01 +0900 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-28 09:24:16 -0700 |
| commit | 98a9c8c3ba13dfc3df8e6d2a126d2fa4e4621e9c (patch) | |
| tree | 3a3fa59159ba65160df4ae600725eddcc8782a17 /arch/x86/kernel/cpu/mcheck | |
| parent | 61a021a0700c22ee527d73d92f9acb109ff478f8 (diff) | |
x86, mce: trivial clean up for mce-inject.c
Fix for:
WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
+#include <asm/uaccess.h>
WARNING: usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc
+ if (m.cpu >= NR_CPUS || !cpu_online(m.cpu))
ERROR: trailing whitespace
+/* $
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-inject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 673c72855022..7b3a5428396a 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -11,13 +11,13 @@ * Andi Kleen * Ying Huang */ +#include <linux/uaccess.h> #include <linux/module.h> #include <linux/timer.h> #include <linux/kernel.h> #include <linux/string.h> #include <linux/fs.h> #include <linux/smp.h> -#include <asm/uaccess.h> #include <asm/mce.h> /* Update fake mce registers on current CPU. */ @@ -93,7 +93,7 @@ static ssize_t mce_write(struct file *filp, const char __user *ubuf, if (copy_from_user(&m, ubuf, usize)) return -EFAULT; - if (m.cpu >= NR_CPUS || !cpu_online(m.cpu)) + if (m.cpu >= num_possible_cpus() || !cpu_online(m.cpu)) return -EINVAL; dm = kmalloc(sizeof(struct delayed_mce), GFP_KERNEL); |