From: Chao Peng <chao.p.peng@linux.intel.com>
Date: Thu, 26 May 2016 02:03:13 +0000 (+0800)
Subject: x86/psr: make opt_psr persistent
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1085
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=663f2f51b10e55a9093a0bc458dadfbaf1705c31;p=xen.git

x86/psr: make opt_psr persistent

opt_psr is now not only used at booting time but also at runtime.
More specifically, it is used to check CDP switch in psr_cpu_init()
which can potentially be called in CPU hotplug case.

Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index f7965520ca..0b5073c41f 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -52,7 +52,7 @@ static unsigned long *__read_mostly cat_socket_enable;
 static struct psr_cat_socket_info *__read_mostly cat_socket_info;
 static unsigned long *__read_mostly cdp_socket_enable;
 
-static unsigned int __initdata opt_psr;
+static unsigned int opt_psr;
 static unsigned int __initdata opt_rmid_max = 255;
 static unsigned int __read_mostly opt_cos_max = 255;
 static uint64_t rmid_mask;