git.samba.org
/
sfrench
/
cifs-2.6.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
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
entry
/
entry_64.S
diff --git
a/arch/x86/entry/entry_64.S
b/arch/x86/entry/entry_64.S
index 3166b967442966734b9db6e8fea541f501aa1e1e..73a522d53b5376b7eaa17cb3d0a7e7be317b02d1 100644
(file)
--- a/
arch/x86/entry/entry_64.S
+++ b/
arch/x86/entry/entry_64.S
@@
-357,7
+357,7
@@
ENTRY(__switch_to_asm)
movq %rsp, TASK_threadsp(%rdi)
movq TASK_threadsp(%rsi), %rsp
-#ifdef CONFIG_
CC_
STACKPROTECTOR
+#ifdef CONFIG_STACKPROTECTOR
movq TASK_stack_canary(%rsi), %rbx
movq %rbx, PER_CPU_VAR(irq_stack_union)+stack_canary_offset
#endif