diff options
-rw-r--r-- | kernel/panic.c | 4 |
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; |