Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee89722 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. 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
parent 447657e3

arch/x86/include/asm/kvm_host.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/desc.h>

#include <asm/desc.h>

#include <asm/mtrr.h>

#include <asm/mtrr.h>

#include <asm/msr-index.h>

#include <asm/msr-index.h>

#include <asm/asm.h>





#define KVM_MAX_VCPUS 254

#define KVM_MAX_VCPUS 254

#define KVM_SOFT_MAX_VCPUS 160

#define KVM_SOFT_MAX_VCPUS 160
@@ -921,9 +922,7 @@ extern bool kvm_rebooting; 
	__ASM_SIZE(push) " $666b \n\t"	      \

	__ASM_SIZE(push) " $666b \n\t"	      \

	"call kvm_spurious_fault \n\t"	      \

	"call kvm_spurious_fault \n\t"	      \

	".popsection \n\t" \

	".popsection \n\t" \

	".pushsection __ex_table, \"a\" \n\t" \

	_ASM_EXTABLE(666b, 667b)

	_ASM_PTR " 666b, 667b \n\t" \

	".popsection"





#define __kvm_handle_fault_on_reboot(insn)		\

#define __kvm_handle_fault_on_reboot(insn)		\

	____kvm_handle_fault_on_reboot(insn, "")

	____kvm_handle_fault_on_reboot(insn, "")