aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-05-15 10:13:13 -0400
committerAvi Kivity <avi@redhat.com>2011-07-12 04:45:01 -0400
commit96304217a783a65c0923a26f54141cfe7a2a71b5 (patch)
tree8992906c52a153c960caefb183dddc3815c6f847 /arch/x86/kvm/vmx.c
parent5e520e62787afd8fc28626fd8d4f77491135119d (diff)
KVM: VMX: always_inline VMREADs
vmcs_readl() and friends are really short, but gcc thinks they are long because of the out-of-line exception handlers. Mark them always_inline to clear the misunderstanding. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r--arch/x86/kvm/vmx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 7d22d6c6734d..3365e5dd3360 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -587,7 +587,7 @@ static inline void ept_sync_individual_addr(u64 eptp, gpa_t gpa)
587 } 587 }
588} 588}
589 589
590static unsigned long vmcs_readl(unsigned long field) 590static __always_inline unsigned long vmcs_readl(unsigned long field)
591{ 591{
592 unsigned long value; 592 unsigned long value;
593 593
@@ -596,17 +596,17 @@ static unsigned long vmcs_readl(unsigned long field)
596 return value; 596 return value;
597} 597}
598 598
599static u16 vmcs_read16(unsigned long field) 599static __always_inline u16 vmcs_read16(unsigned long field)
600{ 600{
601 return vmcs_readl(field); 601 return vmcs_readl(field);
602} 602}
603 603
604static u32 vmcs_read32(unsigned long field) 604static __always_inline u32 vmcs_read32(unsigned long field)
605{ 605{
606 return vmcs_readl(field); 606 return vmcs_readl(field);
607} 607}
608 608
609static u64 vmcs_read64(unsigned long field) 609static __always_inline u64 vmcs_read64(unsigned long field)
610{ 610{
611#ifdef CONFIG_X86_64 611#ifdef CONFIG_X86_64
612 return vmcs_readl(field); 612 return vmcs_readl(field);