aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <76306.1226@compuserve.com>2006-06-25 05:46:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 10:00:55 -0700
commitcaad3c2a15dfa2e0da8cf51a57c052372123483c (patch)
treec9321da5eaa1e71c682aa6f598cff48e4c1406c1
parent186989177e627c2571a3026d39ea1433e4ddc097 (diff)
downloadkernel_samsung_espresso10-caad3c2a15dfa2e0da8cf51a57c052372123483c.zip
kernel_samsung_espresso10-caad3c2a15dfa2e0da8cf51a57c052372123483c.tar.gz
kernel_samsung_espresso10-caad3c2a15dfa2e0da8cf51a57c052372123483c.tar.bz2
[PATCH] i386: cpu_relax() in crash.c and doublefault.c
Add cpu_relax() to infinite loops in crash.c and doublefault.c. This is the safest change. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/crash.c3
-rw-r--r--arch/i386/kernel/doublefault.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 2b0cfce..21dc1bb 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -114,7 +114,8 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
atomic_dec(&waiting_for_crash_ipi);
/* Assume hlt works */
halt();
- for(;;);
+ for (;;)
+ cpu_relax();
return 1;
}
diff --git a/arch/i386/kernel/doublefault.c b/arch/i386/kernel/doublefault.c
index 5edb1d3..b4d14c2 100644
--- a/arch/i386/kernel/doublefault.c
+++ b/arch/i386/kernel/doublefault.c
@@ -44,7 +44,8 @@ static void doublefault_fn(void)
}
}
- for (;;) /* nothing */;
+ for (;;)
+ cpu_relax();
}
struct tss_struct doublefault_tss __cacheline_aligned = {