diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2012-04-20 13:41:59 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-04-20 13:51:40 -0700 |
| commit | 3ee89722cfb165295cc8eb498018c0bdafc57062 (patch) | |
| tree | d86c5ed347a2310aac64ddd2eacd7b833383df31 /arch/x86/include/asm/kvm_host.h | |
| parent | x86, extable: Remove the now-unused __ASM_EX_SEC macros (diff) | |
| download | linux-dev-3ee89722cfb165295cc8eb498018c0bdafc57062.tar.xz linux-dev-3ee89722cfb165295cc8eb498018c0bdafc57062.zip | |
x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h
Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h,
and replace them with _ASM_EXTABLE() macros; this will allow us to
change the format and type of the exception table entries.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index e216ba066e79..e5b97be12d2a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -27,6 +27,7 @@ #include <asm/desc.h> #include <asm/mtrr.h> #include <asm/msr-index.h> +#include <asm/asm.h> #define KVM_MAX_VCPUS 254 #define KVM_SOFT_MAX_VCPUS 160 @@ -921,9 +922,7 @@ extern bool kvm_rebooting; __ASM_SIZE(push) " $666b \n\t" \ "call kvm_spurious_fault \n\t" \ ".popsection \n\t" \ - ".pushsection __ex_table, \"a\" \n\t" \ - _ASM_PTR " 666b, 667b \n\t" \ - ".popsection" + _ASM_EXTABLE(666b, 667b) #define __kvm_handle_fault_on_reboot(insn) \ ____kvm_handle_fault_on_reboot(insn, "") |