Skip to contentSkip to conversation

x86_64: tidy up KASAN_EXTRA

PATCH In review Qian Cai 2 participants 2 messages Feb 6, 2019 – Feb 11, 2019 x86

lore
Share & tools
lore

Qian Cai

author
#0 lore raw

PATCH 1/1 x86_64: tidy up KASAN_EXTRA

The commit 585a4c1f9978 ("kasan: remove use after scope bugs detection.") removed KASAN_EXTRA, so tidy up leftovers.

---
 arch/x86/include/asm/page_64_types.h | 4 ----
 1 file changed, 4 deletions(-)
arch/x86/include/asm/page_64_types.h +0 -4
index 0ce558a8150d..8f657286d599 100644
@@ -7,11 +7,7 @@
 #endif
 
 #ifdef CONFIG_KASAN
-#ifdef CONFIG_KASAN_EXTRA
-#define KASAN_STACK_ORDER 2
-#else
 #define KASAN_STACK_ORDER 1
-#endif
 #else
 #define KASAN_STACK_ORDER 0
 #endif
Signature · 1 line
2.17.2 (Apple Git-113)
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · Qian Cai

The commit 585a4c1f9978 ("kasan: remove use after scope bugs detection.") removed KASAN_EXTRA, so tidy up leftovers.

---
 arch/x86/include/asm/page_64_types.h | 4 ----
 1 file changed, 4 deletions(-)
arch/x86/include/asm/page_64_types.h +0 -0
index 0ce558a8150d..8f657286d599 100644
@@ -7,11 +7,7 @@
 #endif

arch/x86/include/asm/page_64_types.h line 13

Quoted 10 lines
arch/x86/include/asm/page_64_types.h +0 -4
 
 #ifdef CONFIG_KASAN
-#ifdef CONFIG_KASAN_EXTRA
-#define KASAN_STACK_ORDER 2
-#else
 #define KASAN_STACK_ORDER 1
-#endif
 #else
 #define KASAN_STACK_ORDER 0
 #endif

Thanks,

Ingo