提交 8ceed347 编写于 作者: A Avi Kivity

KVM: Simplify exception entries by using __ASM_SIZE and _ASM_PTR

Signed-off-by: NAvi Kivity <avi@qumranet.com>
上级 ecfc79c7
...@@ -734,15 +734,6 @@ enum { ...@@ -734,15 +734,6 @@ enum {
TASK_SWITCH_GATE = 3, TASK_SWITCH_GATE = 3,
}; };
#ifdef CONFIG_64BIT
# define KVM_EX_ENTRY ".quad"
# define KVM_EX_PUSH "pushq"
#else
# define KVM_EX_ENTRY ".long"
# define KVM_EX_PUSH "pushl"
#endif
/* /*
* Hardware virtualization extension instructions may fault if a * Hardware virtualization extension instructions may fault if a
* reboot turns off virtualization while processes are running. * reboot turns off virtualization while processes are running.
...@@ -754,11 +745,11 @@ asmlinkage void kvm_handle_fault_on_reboot(void); ...@@ -754,11 +745,11 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
"666: " insn "\n\t" \ "666: " insn "\n\t" \
".pushsection .fixup, \"ax\" \n" \ ".pushsection .fixup, \"ax\" \n" \
"667: \n\t" \ "667: \n\t" \
KVM_EX_PUSH " $666b \n\t" \ __ASM_SIZE(push) " $666b \n\t" \
"jmp kvm_handle_fault_on_reboot \n\t" \ "jmp kvm_handle_fault_on_reboot \n\t" \
".popsection \n\t" \ ".popsection \n\t" \
".pushsection __ex_table, \"a\" \n\t" \ ".pushsection __ex_table, \"a\" \n\t" \
KVM_EX_ENTRY " 666b, 667b \n\t" \ _ASM_PTR " 666b, 667b \n\t" \
".popsection" ".popsection"
#define KVM_ARCH_WANT_MMU_NOTIFIER #define KVM_ARCH_WANT_MMU_NOTIFIER
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册