diff options
author | Chuck Ebbert <76306.1226@compuserve.com> | 2006-06-25 08:46:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:00:55 -0400 |
commit | caad3c2a15dfa2e0da8cf51a57c052372123483c (patch) | |
tree | c9321da5eaa1e71c682aa6f598cff48e4c1406c1 /arch/i386 | |
parent | 186989177e627c2571a3026d39ea1433e4ddc097 (diff) |
[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>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/crash.c | 3 | ||||
-rw-r--r-- | arch/i386/kernel/doublefault.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c index 2b0cfce24a61..21dc1bbb8067 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) | |||
114 | atomic_dec(&waiting_for_crash_ipi); | 114 | atomic_dec(&waiting_for_crash_ipi); |
115 | /* Assume hlt works */ | 115 | /* Assume hlt works */ |
116 | halt(); | 116 | halt(); |
117 | for(;;); | 117 | for (;;) |
118 | cpu_relax(); | ||
118 | 119 | ||
119 | return 1; | 120 | return 1; |
120 | } | 121 | } |
diff --git a/arch/i386/kernel/doublefault.c b/arch/i386/kernel/doublefault.c index 5edb1d379add..b4d14c2eb345 100644 --- a/arch/i386/kernel/doublefault.c +++ b/arch/i386/kernel/doublefault.c | |||
@@ -44,7 +44,8 @@ static void doublefault_fn(void) | |||
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | for (;;) /* nothing */; | 47 | for (;;) |
48 | cpu_relax(); | ||
48 | } | 49 | } |
49 | 50 | ||
50 | struct tss_struct doublefault_tss __cacheline_aligned = { | 51 | struct tss_struct doublefault_tss __cacheline_aligned = { |