From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 3 Jan 2017 17:46:58 +0000 (+0000)
Subject: x86/svm: Replace opencoded 1GB superpage check
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3059
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36e83e513e273c02050a89f2d74939d8be9f1db8;p=xen.git

x86/svm: Replace opencoded 1GB superpage check

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by:  Boris Ostrovsky <boris.ostrovsky@oracle.com>
---

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 89daa39cd2..04a7b60553 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1473,7 +1473,7 @@ const struct hvm_function_table * __init start_svm(void)
 
     svm_function_table.hap_supported = !!cpu_has_svm_npt;
     svm_function_table.hap_capabilities = HVM_HAP_SUPERPAGE_2MB |
-        ((cpuid_edx(0x80000001) & 0x04000000) ? HVM_HAP_SUPERPAGE_1GB : 0);
+        (cpu_has_page1gb ? HVM_HAP_SUPERPAGE_1GB : 0);
 
     return &svm_function_table;
 }