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

Commit 88976ee1 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86: use _ASM_EXTABLE macro in include/asm-x86/system.h 



Use the _ASM_EXTABLE macro from <asm/asm.h>, instead of open-coding
__ex_table entires in include/asm-x86/system.h.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7d24a827

include/asm-x86/system.h

+5 −10
Original line number Diff line number Diff line
@@ -130,10 +130,7 @@ extern void load_gs_index(unsigned); 
		"movl %k1, %%" #seg "\n\t"	\

		"jmp 2b\n"			\

		".previous\n"			\

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

		_ASM_ALIGN "\n\t"		\

		_ASM_PTR " 1b,3b\n"		\

		".previous"			\

		_ASM_EXTABLE(1b,3b)		\

		: :"r" (value), "r" (0))
@@ -216,9 +213,7 @@ static inline unsigned long native_read_cr4_safe(void) 
#ifdef CONFIG_X86_32

	asm volatile("1: mov %%cr4, %0\n"

		     "2:\n"

		".section __ex_table,\"a\"	\n"

		".long 1b,2b			\n"

		".previous			\n"

		     _ASM_EXTABLE(1b,2b)

		     : "=r" (val), "=m" (__force_order) : "0" (0));

#else

	val = native_read_cr4();