projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables
[linux-2.6-block.git]
/
arch
/
x86
/
entry
/
entry_32.S
diff --git
a/arch/x86/entry/entry_32.S
b/arch/x86/entry/entry_32.S
index bef8e2b202a8c0a608fb3dad7e38fb58889ee88e..2582881d19ceeeb75a9a90588547914ccdefdbd0 100644
(file)
--- a/
arch/x86/entry/entry_32.S
+++ b/
arch/x86/entry/entry_32.S
@@
-239,7
+239,7
@@
ENTRY(__switch_to_asm)
movl %esp, TASK_threadsp(%eax)
movl TASK_threadsp(%edx), %esp
-#ifdef CONFIG_
CC_
STACKPROTECTOR
+#ifdef CONFIG_STACKPROTECTOR
movl TASK_stack_canary(%edx), %ebx
movl %ebx, PER_CPU_VAR(stack_canary)+stack_canary_offset
#endif