Skip to contentSkip to conversation

x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out

PATCH In review Andrew Cooper 3 participants 3 messages Jun 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out

There is no need to automatically disable PV32 support on SHSTK-capable hardware if Xen isn't actually using the feature.

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Paul Durrant <[email protected]>

For 4.14. Minor bugfix.

---
 xen/arch/x86/setup.c | 4 ++++
 1 file changed, 4 insertions(+)
xen/arch/x86/setup.c +4 -0
index 2aa1cd50b8..c9b6af826d 100644
@@ -95,7 +95,11 @@ unsigned long __initdata highmem_start;
 size_param("highmem-start", highmem_start);
 #endif
 
+#ifdef CONFIG_XEN_SHSTK
 static bool __initdata opt_xen_shstk = true;
+#else
+#define opt_xen_shstk false
+#endif
 
 static int __init parse_cet(const char *s)
 {
Signature · 1 line
2.11.0
#2 lore raw
In reply to Andrew Cooper
Quoted 11 lines

-----Original Message-----
From: Andrew Cooper <[email protected]>
Sent: 29 June 2020 11:31
To: Xen-devel <[email protected]>
Cc: Andrew Cooper <[email protected]>; Jan Beulich <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>; Paul Durrant <[email protected]>
Subject: [PATCH] x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out

There is no need to automatically disable PV32 support on SHSTK-capable hardware if Xen isn't actually using the feature.

Quoted 8 lines

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Paul Durrant <[email protected]>

For 4.14. Minor bugfix.

Quoted 22 lines
---
 xen/arch/x86/setup.c | 4 ++++
 1 file changed, 4 insertions(+)
xen/arch/x86/setup.c +4 -1
index 2aa1cd50b8..c9b6af826d 100644
@@ -95,7 +95,11 @@ unsigned long __initdata highmem_start;
 size_param("highmem-start", highmem_start);
 #endif
 
+#ifdef CONFIG_XEN_SHSTK
 static bool __initdata opt_xen_shstk = true;
+#else
+#define opt_xen_shstk false
+#endif
 
 static int __init parse_cet(const char *s)
 {
--

2.11.0