summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-04-30 16:04:51 +0900
committerH. Peter Anvin <hpa@zytor.com>2009-05-28 09:24:16 -0700
commit14a02530e2239f753a0f3f089847e723adbdaa47 (patch)
tree3cd21cbc2b627ac37fb2aa480c1b13c6f9152fee /arch/x86
parentcc3aec52ab8e013984270a79d1aa51f691d239b0 (diff)
downloadop-kernel-dev-14a02530e2239f753a0f3f089847e723adbdaa47.zip
op-kernel-dev-14a02530e2239f753a0f3f089847e723adbdaa47.tar.gz
x86, mce: trivial clean up for mce.c
This fixs following checkpatch warnings: WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h> +#include <asm/uaccess.h> WARNING: Use #include <linux/smp.h> instead of <asm/smp.h> +#include <asm/smp.h> WARNING: line over 80 characters + set_bit(MCE_OVERFLOW, (unsigned long *)&mcelog.flags); WARNING: braces {} are not necessary for any arm of this statement + if (mce_notify_user()) { [...] + } else { [...] 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')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 4375ffb..1d0aa9c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -14,6 +14,7 @@
#include <linux/kallsyms.h>
#include <linux/rcupdate.h>
#include <linux/kobject.h>
+#include <linux/uaccess.h>
#include <linux/kdebug.h>
#include <linux/kernel.h>
#include <linux/percpu.h>
@@ -27,14 +28,13 @@
#include <linux/kmod.h>
#include <linux/poll.h>
#include <linux/cpu.h>
+#include <linux/smp.h>
#include <linux/fs.h>
#include <asm/processor.h>
-#include <asm/uaccess.h>
#include <asm/idle.h>
#include <asm/mce.h>
#include <asm/msr.h>
-#include <asm/smp.h>
#include "mce.h"
@@ -125,7 +125,8 @@ void mce_log(struct mce *mce)
* interesting ones:
*/
if (entry >= MCE_LOG_LEN) {
- set_bit(MCE_OVERFLOW, (unsigned long *)&mcelog.flags);
+ set_bit(MCE_OVERFLOW,
+ (unsigned long *)&mcelog.flags);
return;
}
/* Old left over entry. Skip: */
@@ -556,11 +557,10 @@ static void mcheck_timer(unsigned long data)
* polling interval, otherwise increase the polling interval.
*/
n = &__get_cpu_var(next_interval);
- if (mce_notify_user()) {
+ if (mce_notify_user())
*n = max(*n/2, HZ/100);
- } else {
+ else
*n = min(*n*2, (int)round_jiffies_relative(check_interval*HZ));
- }
t->expires = jiffies + *n;
add_timer(t);
OpenPOWER on IntegriCloud