40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 1eacc509e9158b9e87f05fc9844142c0022b2d64 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Xin Li (Intel)" <xin@zytor.com>
|
||
|
|
Date: Wed, 7 Aug 2024 01:18:10 -0700
|
||
|
|
Subject: [PATCH] target/i386: Delete duplicated macro definition CR4_FRED_MASK
|
||
|
|
|
||
|
|
commit a23bc6539890d8b27458cf56bc4ed0e0d3c2de3e upstream.
|
||
|
|
|
||
|
|
Macro CR4_FRED_MASK is defined twice, delete one.
|
||
|
|
|
||
|
|
Intel-SIG: commit a23bc6539890 target/i386: Delete duplicated macro definition CR4_FRED_MASK
|
||
|
|
|
||
|
|
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240807081813.735158-2-xin@zytor.com
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Jason Zeng <jason.zeng@intel.com>
|
||
|
|
---
|
||
|
|
target/i386/cpu.h | 6 ------
|
||
|
|
1 file changed, 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||
|
|
index 1b9d922651..f022749c86 100644
|
||
|
|
--- a/target/i386/cpu.h
|
||
|
|
+++ b/target/i386/cpu.h
|
||
|
|
@@ -270,12 +270,6 @@ typedef enum X86Seg {
|
||
|
|
#define CR4_FRED_MASK 0
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#ifdef TARGET_X86_64
|
||
|
|
-#define CR4_FRED_MASK (1ULL << 32)
|
||
|
|
-#else
|
||
|
|
-#define CR4_FRED_MASK 0
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
#define CR4_RESERVED_MASK \
|
||
|
|
(~(target_ulong)(CR4_VME_MASK | CR4_PVI_MASK | CR4_TSD_MASK \
|
||
|
|
| CR4_DE_MASK | CR4_PSE_MASK | CR4_PAE_MASK \
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|