---

yaml --- r: 70997 b: refs/heads/master c: 7e02cb9 h: refs/heads/master i: 70995: 8a66c19 v: v3
git-mirror · Oct 17, 2007 · cd6eb15 · cd6eb15
1 parent fa8e4b5
commit cd6eb15
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 35 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f4ed1511dc8c71073bb7d220ee62eedd8e8aeec
+refs/heads/master: 7e02cb941ddc129158c276648c10a69dca7d36d3
diff --git a/trunk/arch/x86/lib/rwlock_64.S b/trunk/arch/x86/lib/rwlock_64.S
@@ -2,7 +2,7 @@
 
 #include <linux/linkage.h>
 #include <asm/rwlock.h>
-#include <asm/alternative-asm.i>
+#include <asm/alternative-asm.h>
 #include <asm/dwarf2.h>
 
 /* rdi:	pointer to rwlock_t */

diff --git a/trunk/arch/x86/lib/semaphore_32.S b/trunk/arch/x86/lib/semaphore_32.S
@@ -15,8 +15,8 @@
 
 #include <linux/linkage.h>
 #include <asm/rwlock.h>
-#include <asm/alternative-asm.i>
-#include <asm/frame.i>
+#include <asm/alternative-asm.h>
+#include <asm/frame.h>
 #include <asm/dwarf2.h>
 
 /*

diff --git a/trunk/include/asm-um/alternative-asm.i → trunk/include/asm-um/alternative-asm.h b/trunk/include/asm-um/alternative-asm.i → trunk/include/asm-um/alternative-asm.h
@@ -1,6 +1,6 @@
 #ifndef __UM_ALTERNATIVE_ASM_I
 #define __UM_ALTERNATIVE_ASM_I
 
-#include "asm/arch/alternative-asm.i"
+#include "asm/arch/alternative-asm.h"
 
 #endif
diff --git a/trunk/include/asm-um/frame.i → trunk/include/asm-um/frame.h b/trunk/include/asm-um/frame.i → trunk/include/asm-um/frame.h
@@ -1,6 +1,6 @@
 #ifndef __UM_FRAME_I
 #define __UM_FRAME_I
 
-#include "asm/arch/frame.i"
+#include "asm/arch/frame.h"
 
 #endif
diff --git a/trunk/include/asm-x86/alternative-asm.h b/trunk/include/asm-x86/alternative-asm.h
@@ -0,0 +1,22 @@
+#ifdef __ASSEMBLY__
+
+#ifdef CONFIG_X86_32
+# define X86_ALIGN .long
+#else
+# define X86_ALIGN .quad
+#endif
+
+#ifdef CONFIG_SMP
+	.macro LOCK_PREFIX
+1:	lock
+	.section .smp_locks,"a"
+	.align 4
+	X86_ALIGN 1b
+	.previous
+	.endm
+#else
+	.macro LOCK_PREFIX
+	.endm
+#endif
+
+#endif  /*  __ASSEMBLY__  */
diff --git a/trunk/include/asm-x86/alternative-asm.i b/trunk/include/asm-x86/alternative-asm.i
diff --git a/trunk/include/asm-x86/alternative-asm_32.i b/trunk/include/asm-x86/alternative-asm_32.i
diff --git a/trunk/include/asm-x86/alternative-asm_64.i b/trunk/include/asm-x86/alternative-asm_64.i
diff --git a/trunk/include/asm-x86/frame.i → trunk/include/asm-x86/frame.h b/trunk/include/asm-x86/frame.i → trunk/include/asm-x86/frame.h
@@ -1,3 +1,5 @@
+#ifdef __ASSEMBLY__
+
 #include <asm/dwarf2.h>
 
 /* The annotation hides the frame from the unwinder and makes it look
@@ -21,3 +23,5 @@
 	.macro ENDFRAME
 	.endm
 #endif
+
+#endif  /*  __ASSEMBLY__  */