aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/kvm_host.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2008-08-14 14:25:47 -0400
committerAvi Kivity <avi@qumranet.com>2008-10-15 04:15:19 -0400
commit8ceed34744f81c4a33d68ab825fd9ad3dd5f5505 (patch)
treea96f9f91c2286346cfb9428f0166de95e68faeba /include/asm-x86/kvm_host.h
parentecfc79c700b02c5ad1ccae58718015caa84824be (diff)
KVM: Simplify exception entries by using __ASM_SIZE and _ASM_PTR
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/asm-x86/kvm_host.h')
-rw-r--r--include/asm-x86/kvm_host.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
index 225fdb835d44..b6d26b80b75b 100644
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -734,15 +734,6 @@ enum {
734 TASK_SWITCH_GATE = 3, 734 TASK_SWITCH_GATE = 3,
735}; 735};
736 736
737
738#ifdef CONFIG_64BIT
739# define KVM_EX_ENTRY ".quad"
740# define KVM_EX_PUSH "pushq"
741#else
742# define KVM_EX_ENTRY ".long"
743# define KVM_EX_PUSH "pushl"
744#endif
745
746/* 737/*
747 * Hardware virtualization extension instructions may fault if a 738 * Hardware virtualization extension instructions may fault if a
748 * reboot turns off virtualization while processes are running. 739 * reboot turns off virtualization while processes are running.
@@ -754,11 +745,11 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
754 "666: " insn "\n\t" \ 745 "666: " insn "\n\t" \
755 ".pushsection .fixup, \"ax\" \n" \ 746 ".pushsection .fixup, \"ax\" \n" \
756 "667: \n\t" \ 747 "667: \n\t" \
757 KVM_EX_PUSH " $666b \n\t" \ 748 __ASM_SIZE(push) " $666b \n\t" \
758 "jmp kvm_handle_fault_on_reboot \n\t" \ 749 "jmp kvm_handle_fault_on_reboot \n\t" \
759 ".popsection \n\t" \ 750 ".popsection \n\t" \
760 ".pushsection __ex_table, \"a\" \n\t" \ 751 ".pushsection __ex_table, \"a\" \n\t" \
761 KVM_EX_ENTRY " 666b, 667b \n\t" \ 752 _ASM_PTR " 666b, 667b \n\t" \
762 ".popsection" 753 ".popsection"
763 754
764#define KVM_ARCH_WANT_MMU_NOTIFIER 755#define KVM_ARCH_WANT_MMU_NOTIFIER