[PATCH] Clean up after over-efficient machine formatting

From: H. Peter Anvin
Date: Wed Apr 11 2007 - 13:56:41 EST


The recent patch cleanup up, among other things, msr.h, used a script
to canonicalize the formatting. Unfortunately it also formatted the
EFER bit numbers as 32-bit expanded hex, which is ridiculous. Clean up.

Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>

diff -urN --exclude 'o.*' --exclude '*~' stock/linux-2.6.21-rc6-mm1-cc1/include/asm-i386/msr-index.h linux-2.6.21-rc6-mm1/include/asm-i386/msr-index.h
--- stock/linux-2.6.21-rc6-mm1-cc1/include/asm-i386/msr-index.h 2007-04-11 10:51:06.000000000 -0700
+++ linux-2.6.21-rc6-mm1/include/asm-i386/msr-index.h 2007-04-10 10:57:06.000000000 -0700
@@ -12,10 +12,10 @@
#define MSR_KERNEL_GS_BASE 0xc0000102 /* SwapGS GS shadow */

/* EFER bits: */
-#define _EFER_SCE 0x00000000 /* SYSCALL/SYSRET */
-#define _EFER_LME 0x00000008 /* Long mode enable */
-#define _EFER_LMA 0x0000000a /* Long mode active (read-only) */
-#define _EFER_NX 0x0000000b /* No execute enable */
+#define _EFER_SCE 0 /* SYSCALL/SYSRET */
+#define _EFER_LME 8 /* Long mode enable */
+#define _EFER_LMA 10 /* Long mode active (read-only) */
+#define _EFER_NX 11 /* No execute enable */

#define EFER_SCE (1<<_EFER_SCE)
#define EFER_LME (1<<_EFER_LME)
-
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/