diff options
| author | Adrian Bunk <bunk@kernel.org> | 2007-10-17 18:04:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:16:29 +0200 |
| commit | 7e02cb941ddc129158c276648c10a69dca7d36d3 (patch) | |
| tree | 79db7b7d1c607c15f67ae53248ccdf762a0aaa8e /include | |
| parent | 3f4ed1511dc8c71073bb7d220ee62eedd8e8aeec (diff) | |
x86: rename .i assembler includes to .h
.i is an ending used for preprocessed stuff.
This patch therefore renames assembler include files to .h and guards
the contents with an #ifdef __ASSEMBLY__.
[ tglx: arch/x86 adaptation ]
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-um/alternative-asm.h (renamed from include/asm-um/alternative-asm.i) | 2 | ||||
| -rw-r--r-- | include/asm-um/frame.h (renamed from include/asm-um/frame.i) | 2 | ||||
| -rw-r--r-- | include/asm-x86/alternative-asm.h | 22 | ||||
| -rw-r--r-- | include/asm-x86/alternative-asm.i | 5 | ||||
| -rw-r--r-- | include/asm-x86/alternative-asm_32.i | 12 | ||||
| -rw-r--r-- | include/asm-x86/alternative-asm_64.i | 12 | ||||
| -rw-r--r-- | include/asm-x86/frame.h (renamed from include/asm-x86/frame.i) | 4 |
7 files changed, 28 insertions, 31 deletions
diff --git a/include/asm-um/alternative-asm.i b/include/asm-um/alternative-asm.h index cae9faca132..9aa9fa2402a 100644 --- a/include/asm-um/alternative-asm.i +++ b/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/include/asm-um/frame.i b/include/asm-um/frame.h index 09d5dca5d92..8a8c1cb415b 100644 --- a/include/asm-um/frame.i +++ b/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/include/asm-x86/alternative-asm.h b/include/asm-x86/alternative-asm.h new file mode 100644 index 00000000000..e2077d343c3 --- /dev/null +++ b/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/include/asm-x86/alternative-asm.i b/include/asm-x86/alternative-asm.i deleted file mode 100644 index 4f360cd3c88..00000000000 --- a/include/asm-x86/alternative-asm.i +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef CONFIG_X86_32 -# include "alternative-asm_32.i" -#else -# include "alternative-asm_64.i" -#endif diff --git a/include/asm-x86/alternative-asm_32.i b/include/asm-x86/alternative-asm_32.i deleted file mode 100644 index f0510209ccb..00000000000 --- a/include/asm-x86/alternative-asm_32.i +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef CONFIG_SMP - .macro LOCK_PREFIX -1: lock - .section .smp_locks,"a" - .align 4 - .long 1b - .previous - .endm -#else - .macro LOCK_PREFIX - .endm -#endif diff --git a/include/asm-x86/alternative-asm_64.i b/include/asm-x86/alternative-asm_64.i deleted file mode 100644 index 0b3f1a2bb2c..00000000000 --- a/include/asm-x86/alternative-asm_64.i +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef CONFIG_SMP - .macro LOCK_PREFIX -1: lock - .section .smp_locks,"a" - .align 8 - .quad 1b - .previous - .endm -#else - .macro LOCK_PREFIX - .endm -#endif diff --git a/include/asm-x86/frame.i b/include/asm-x86/frame.h index 03620251ae1..06850a7194e 100644 --- a/include/asm-x86/frame.i +++ b/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__ */ |