projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kasan: remove redundant config option
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
acpi
/
wakeup_64.S
diff --git
a/arch/x86/kernel/acpi/wakeup_64.S
b/arch/x86/kernel/acpi/wakeup_64.S
index
56b6865
..
d5d8a35
100644
(file)
--- a/
arch/x86/kernel/acpi/wakeup_64.S
+++ b/
arch/x86/kernel/acpi/wakeup_64.S
@@
-115,7
+115,7
@@
SYM_FUNC_START(do_suspend_lowlevel)
movq pt_regs_r14(%rax), %r14
movq pt_regs_r15(%rax), %r15
movq pt_regs_r14(%rax), %r14
movq pt_regs_r15(%rax), %r15
-#if defined(CONFIG_KASAN) &&
CONFIG_KASAN_STACK
+#if defined(CONFIG_KASAN) &&
defined(CONFIG_KASAN_STACK)
/*
* The suspend path may have poisoned some areas deeper in the stack,
* which we now need to unpoison.
/*
* The suspend path may have poisoned some areas deeper in the stack,
* which we now need to unpoison.