lkml.org 
[lkml]   [2020]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86/entry: Fix unused-function warning
Date
The new 'address' variable is only used in some configurations:

arch/x86/kernel/traps.c:332:16: error: unused variable 'address' [-Werror,-Wunused-variable]
unsigned long address = read_cr2();

Change the #ifdef guard to cover this case as well.

Fixes: 095b7a3e7745 ("x86/entry: Convert double fault exception to IDTENTRY_DF")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/kernel/traps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 35298c1df32f..c9d0d466641a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -328,7 +328,7 @@ DEFINE_IDTENTRY_DF(exc_double_fault)
static const char str[] = "double fault";
struct task_struct *tsk = current;

-#ifdef CONFIG_X86_64
+#if defined(CONFIG_X86_64) && defined(CONFIG_VMAP_STACK)
unsigned long address = read_cr2();
#endif

--
2.26.2
\
 
 \ /
  Last update: 2020-05-27 15:50    [W:0.022 / U:0.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site