[tip:x86/asm] x86: Clean up the loadsegment() macro
From: tip-bot for Ingo Molnar
Date: Thu Nov 26 2009 - 04:57:06 EST
Commit-ID: 64b028b22616946a05bf9580f7f7f7ee2ac070b4
Gitweb: http://git.kernel.org/tip/64b028b22616946a05bf9580f7f7f7ee2ac070b4
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Thu, 26 Nov 2009 10:37:55 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 26 Nov 2009 10:38:52 +0100
x86: Clean up the loadsegment() macro
Make it readable in the source too, not just in the assembly output.
No change in functionality.
Cc: Brian Gerst <brgerst@xxxxxxxxx>
LKML-Reference: <1259176706-5908-1-git-send-email-brgerst@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/include/asm/system.h | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
index 537395a..022a843 100644
--- a/arch/x86/include/asm/system.h
+++ b/arch/x86/include/asm/system.h
@@ -155,19 +155,21 @@ extern void native_load_gs_index(unsigned);
* Load a segment. Fall back on loading the zero
* segment if something goes wrong..
*/
-#define loadsegment(seg, value) \
-do { \
- unsigned short __val = value; \
- asm volatile("\n" \
- "1:\t" \
- "movl %k0,%%" #seg "\n" \
- ".section .fixup,\"ax\"\n" \
- "2:\t" \
- "xorl %k0,%k0\n\t" \
- "jmp 1b\n" \
- ".previous\n" \
- _ASM_EXTABLE(1b, 2b) \
- : "+r" (__val) : : "memory"); \
+#define loadsegment(seg, value) \
+do { \
+ unsigned short __val = (value); \
+ \
+ asm volatile(" \n" \
+ "1: movl %k0,%%" #seg " \n" \
+ \
+ ".section .fixup,\"ax\" \n" \
+ "2: xorl %k0,%k0 \n" \
+ " jmp 1b \n" \
+ ".previous \n" \
+ \
+ _ASM_EXTABLE(1b, 2b) \
+ \
+ : "+r" (__val) : : "memory"); \
} while (0)
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/