aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2008-04-14 13:03:50 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-26 10:15:32 -0400
commitb719ac56c0032bc1602914c6ea70b0f1581b08c7 (patch)
tree08559cf024306f905e8cec67390ee88e37da0de1 /kernel/panic.c
parent54371a43a66f4477889769b4fa00df936855dc8f (diff)
panic.c: fix whitespace additions
trivial: remove white space addition in stack protector Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 50cf9257b234..866be9b72e4f 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -341,14 +341,14 @@ static noinline void __stack_chk_test_func(void)
341 * Besides, if we would, the test is already failed anyway so 341 * Besides, if we would, the test is already failed anyway so
342 * time to pull the emergency brake on it. 342 * time to pull the emergency brake on it.
343 */ 343 */
344 if ((unsigned long)__builtin_return_address(0) == 344 if ((unsigned long)__builtin_return_address(0) ==
345 *(((unsigned long *)&foo)+1)) { 345 *(((unsigned long *)&foo)+1)) {
346 printk(KERN_ERR "No -fstack-protector-stack-frame!\n"); 346 printk(KERN_ERR "No -fstack-protector-stack-frame!\n");
347 return; 347 return;
348 } 348 }
349#ifdef CONFIG_FRAME_POINTER 349#ifdef CONFIG_FRAME_POINTER
350 /* We also don't want to clobber the frame pointer */ 350 /* We also don't want to clobber the frame pointer */
351 if ((unsigned long)__builtin_return_address(0) == 351 if ((unsigned long)__builtin_return_address(0) ==
352 *(((unsigned long *)&foo)+2)) { 352 *(((unsigned long *)&foo)+2)) {
353 printk(KERN_ERR "No -fstack-protector-stack-frame!\n"); 353 printk(KERN_ERR "No -fstack-protector-stack-frame!\n");
354 return; 354 return;