From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 12 Jul 2022 09:14:34 +0000 (+0200)
Subject: x86/spec-ctrl: Honour spec-ctrl=0 for unpriv-mmio sub-option
X-Git-Tag: archive/raspbian/4.16.2-1+rpi1^2~34^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61b9c2ceeb94b0cdaff01023cc5523b1f13e66e2;p=xen.git

x86/spec-ctrl: Honour spec-ctrl=0 for unpriv-mmio sub-option

This was an oversight from when unpriv-mmio was introduced.

Fixes: 8c24b70fedcb ("x86/spec-ctrl: Add spec-ctrl=unpriv-mmio")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
master commit: 4cdb519d797c19ebb8fadc5938cdb47479d5a21b
master date: 2022-07-11 15:21:35 +0100
---

diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
index dfdd45c358..ae74943c10 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -122,6 +122,7 @@ static int __init parse_spec_ctrl(const char *s)
             opt_l1d_flush = 0;
             opt_branch_harden = false;
             opt_srb_lock = 0;
+            opt_unpriv_mmio = false;
         }
         else if ( val > 0 )
             rc = -EINVAL;