Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136357
b: refs/heads/master
c: b719ac5
h: refs/heads/master
i:
  136355: f4e8a00
v: v3
  • Loading branch information
Daniel Walker authored and Thomas Gleixner committed May 26, 2008
1 parent dcccb99 commit 6c1910b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54371a43a66f4477889769b4fa00df936855dc8f
refs/heads/master: b719ac56c0032bc1602914c6ea70b0f1581b08c7
4 changes: 2 additions & 2 deletions trunk/kernel/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,14 @@ static noinline void __stack_chk_test_func(void)
* Besides, if we would, the test is already failed anyway so
* time to pull the emergency brake on it.
*/
if ((unsigned long)__builtin_return_address(0) ==
if ((unsigned long)__builtin_return_address(0) ==
*(((unsigned long *)&foo)+1)) {
printk(KERN_ERR "No -fstack-protector-stack-frame!\n");
return;
}
#ifdef CONFIG_FRAME_POINTER
/* We also don't want to clobber the frame pointer */
if ((unsigned long)__builtin_return_address(0) ==
if ((unsigned long)__builtin_return_address(0) ==
*(((unsigned long *)&foo)+2)) {
printk(KERN_ERR "No -fstack-protector-stack-frame!\n");
return;
Expand Down

0 comments on commit 6c1910b

Please sign in to comment.