From: Paolo Bonzini <pbonzini@xxxxxxxxxx>
Fedora 32 croaks about a symbol that is defined twice, fix it.
Reported-by: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
Message-Id: <20200511165959.42442-1-pbonzini@xxxxxxxxxx>
Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
---
lib/x86/fault_test.c | 2 +-
lib/x86/usermode.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/x86/fault_test.c b/lib/x86/fault_test.c
index 078dae3..e15a218 100644
--- a/lib/x86/fault_test.c
+++ b/lib/x86/fault_test.c
@@ -1,6 +1,6 @@
#include "fault_test.h"
-jmp_buf jmpbuf;
+static jmp_buf jmpbuf;
static void restore_exec_to_jmpbuf(void)
{
diff --git a/lib/x86/usermode.c b/lib/x86/usermode.c
index f01ad9b..f032523 100644
--- a/lib/x86/usermode.c
+++ b/lib/x86/usermode.c
@@ -14,7 +14,7 @@
#define USERMODE_STACK_SIZE 0x2000
#define RET_TO_KERNEL_IRQ 0x20
-jmp_buf jmpbuf;
+static jmp_buf jmpbuf;
static void restore_exec_to_jmpbuf(void)
{
--
2.18.1
