From 2a548c12ba81ced14d33358c6c22717250fc3046 Mon Sep 17 00:00:00 2001 From: Qian Cai Date: Wed, 6 Mar 2019 16:38:06 -0500 Subject: [PATCH] UPSTREAM: Revert "x86_64: Increase stack size for KASAN_EXTRA" (Upstream commit a2863b53418d7d8f6332adf0cfb32611def0c4b9). 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 Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: bp@alien8.de Cc: akpm@linux-foundation.org Cc: aryabinin@virtuozzo.com Cc: glider@google.com Cc: dvyukov@google.com Cc: hpa@zytor.com Link: https://lkml.kernel.org/r/20190306213806.46139-1-cai@lca.pw Signed-off-by: Andrey Konovalov Bug: 128674696 Change-Id: I81cae91b45c69906239518da0965a139112ccfe2 --- 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 0b6352aabbd3..b99d497e342d 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