lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
H. Peter Anvin
2008-02-04 16:47:58 +01:00
committed by Ingo Molnar
parent 7d24a82708
commit 88976ee187
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/asm-x86/system.h
View File

@@ -130,10 +130,7 @@ extern void load_gs_index(unsigned);
"movl %k1, %%" #seg "\n\t" \ "movl %k1, %%" #seg "\n\t" \
"jmp 2b\n" \ "jmp 2b\n" \
".previous\n" \ ".previous\n" \
".section __ex_table,\"a\"\n\t" \ _ASM_EXTABLE(1b,3b) \
_ASM_ALIGN "\n\t" \
_ASM_PTR " 1b,3b\n" \
".previous" \
: :"r" (value), "r" (0)) : :"r" (value), "r" (0))
@@ -216,9 +213,7 @@ static inline unsigned long native_read_cr4_safe(void)
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
asm volatile("1: mov %%cr4, %0\n" asm volatile("1: mov %%cr4, %0\n"
"2:\n" "2:\n"
".section __ex_table,\"a\" \n" _ASM_EXTABLE(1b,2b)
".long 1b,2b \n"
".previous \n"
: "=r" (val), "=m" (__force_order) : "0" (0)); : "=r" (val), "=m" (__force_order) : "0" (0));
#else #else
val = native_read_cr4(); val = native_read_cr4();