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

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

x86: use _ASM_EXTABLE macro in arch/x86/lib/usercopy_32.c 



Use the _ASM_EXTABLE macro from <asm/asm.h>, instead of open-coding
__ex_table entires in arch/x86/lib/usercopy_32.c.

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 e7a40d26

arch/x86/lib/usercopy_32.c

+3 −9
Original line number Diff line number Diff line
@@ -48,10 +48,7 @@ do { \ 
		"3:	movl %5,%0\n"					   \

		"	jmp 2b\n"					   \

		".previous\n"						   \

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

		"	.align 4\n"					   \

		"	.long 0b,3b\n"					   \

		".previous"						   \

		_ASM_EXTABLE(0b,3b)					   \

		: "=d"(res), "=c"(count), "=&a" (__d0), "=&S" (__d1),	   \

		  "=&D" (__d2)						   \

		: "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \
@@ -132,11 +129,8 @@ do { \ 
		"3:	lea 0(%2,%0,4),%0\n"				\

		"	jmp 2b\n"					\

		".previous\n"						\

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

		"	.align 4\n"					\

		"	.long 0b,3b\n"					\

		"	.long 1b,2b\n"					\

		".previous"						\

		_ASM_EXTABLE(0b,3b)					\

		_ASM_EXTABLE(1b,2b)					\

		: "=&c"(size), "=&D" (__d0)				\

		: "r"(size & 3), "0"(size / 4), "1"(addr), "a"(0));	\

} while (0)