From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 11 Oct 2018 17:40:45 +0000 (+0200)
Subject: KVM/x86: Use 32bit xor to clear register
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44c2d667ce3fa6933ac30a726f148f0c6d84ce5f;p=android-x86%2Fkernel.git

KVM/x86: Use 32bit xor to clear register

x86_64 zero-extends 32bit xor to a full 64bit register. Use %k asm
operand modifier to force 32bit register and save 268 bytes in kvm.o

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index c1b9bd15815c..0050fe81d857 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -61,7 +61,7 @@
 
 #define __ex(x) __kvm_handle_fault_on_reboot(x)
 #define __ex_clear(x, reg) \
-	____kvm_handle_fault_on_reboot(x, "xor " reg " , " reg)
+	____kvm_handle_fault_on_reboot(x, "xorl " reg " , " reg)
 
 MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
@@ -2312,7 +2312,7 @@ static __always_inline unsigned long __vmcs_readl(unsigned long field)
 {
 	unsigned long value;
 
-	asm volatile (__ex_clear("vmread %1, %0", "%0")
+	asm volatile (__ex_clear("vmread %1, %0", "%k0")
 		      : "=r"(value) : "r"(field));
 	return value;
 }