[tip:x86/urgent] Revert "x86_64: Increase stack size for KASAN_EXTRA"

From: tip-bot for Qian Cai
Date: Wed Mar 06 2019 - 17:32:40 EST


Commit-ID: a2863b53418d7d8f6332adf0cfb32611def0c4b9
Gitweb: https://git.kernel.org/tip/a2863b53418d7d8f6332adf0cfb32611def0c4b9
Author: Qian Cai <cai@xxxxxx>
AuthorDate: Wed, 6 Mar 2019 16:38:06 -0500
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Wed, 6 Mar 2019 23:03:27 +0100

Revert "x86_64: Increase stack size for KASAN_EXTRA"

This reverts commit a8e911d13540487942d53137c156bd7707f66e5d.
KASAN_EXTRA was removed via the commit 7771bdbbfd3d ("kasan: remove use
after scope bugs detection."), so this is no longer needed.

Signed-off-by: Qian Cai <cai@xxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: bp@xxxxxxxxx
Cc: akpm@xxxxxxxxxxxxxxxxxxxx
Cc: aryabinin@xxxxxxxxxxxxx
Cc: glider@xxxxxxxxxx
Cc: dvyukov@xxxxxxxxxx
Cc: hpa@xxxxxxxxx
Link: https://lkml.kernel.org/r/20190306213806.46139-1-cai@xxxxxx

---
arch/x86/include/asm/page_64_types.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 0ce558a8150d..8f657286d599 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -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