[Xen-changelog] [xen-unstable] svm: Re-enable 2MB super paging

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1287560518 -3600
# Node ID 3ae2e9298cb61aacfc0dd276aaaf9395e737d2a4
# Parent  4a2f991dcb71cd1c25ac868f3e4bdc50b027b8a3
svm: Re-enable 2MB super paging

Bitwise OR operator has higher precedence than conditional
operator. This patch fixes the incorrect associativity and re-enables
2MB paging for AMD family 10h system.

Signed-off-by: Wei Wang <wei.wang2@xxxxxxx>
Acked-by: Wei Huang <wei.huang2@xxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 4a2f991dcb71 -r 3ae2e9298cb6 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Wed Oct 20 08:40:44 2010 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c        Wed Oct 20 08:41:58 2010 +0100
@@ -904,8 +904,8 @@ struct hvm_function_table * __init start
 
     svm_function_table.hap_supported = cpu_has_svm_npt;
     svm_function_table.hap_capabilities = HVM_HAP_SUPERPAGE_2MB |
-        ((CONFIG_PAGING_LEVELS == 4) && (cpuid_edx(0x80000001) & 0x04000000)) ?
-            HVM_HAP_SUPERPAGE_1GB : 0;
+        (((CONFIG_PAGING_LEVELS == 4) && (cpuid_edx(0x80000001) & 0x04000000)) 
?
+            HVM_HAP_SUPERPAGE_1GB : 0);
 
     return &svm_function_table;
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog