From 7e02cb941ddc129158c276648c10a69dca7d36d3 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 17 Oct 2007 18:04:38 +0200 Subject: 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 Signed-off-by: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/lib/rwlock_64.S | 2 +- arch/x86/lib/semaphore_32.S | 4 ++-- include/asm-um/alternative-asm.h | 6 ++++++ include/asm-um/alternative-asm.i | 6 ------ include/asm-um/frame.h | 6 ++++++ include/asm-um/frame.i | 6 ------ include/asm-x86/alternative-asm.h | 22 ++++++++++++++++++++++ include/asm-x86/alternative-asm.i | 5 ----- include/asm-x86/alternative-asm_32.i | 12 ------------ include/asm-x86/alternative-asm_64.i | 12 ------------ include/asm-x86/frame.h | 27 +++++++++++++++++++++++++++ include/asm-x86/frame.i | 23 ----------------------- 12 files changed, 64 insertions(+), 67 deletions(-) create mode 100644 include/asm-um/alternative-asm.h delete mode 100644 include/asm-um/alternative-asm.i create mode 100644 include/asm-um/frame.h delete mode 100644 include/asm-um/frame.i create mode 100644 include/asm-x86/alternative-asm.h delete mode 100644 include/asm-x86/alternative-asm.i delete mode 100644 include/asm-x86/alternative-asm_32.i delete mode 100644 include/asm-x86/alternative-asm_64.i create mode 100644 include/asm-x86/frame.h delete mode 100644 include/asm-x86/frame.i diff --git a/arch/x86/lib/rwlock_64.S b/arch/x86/lib/rwlock_64.S index 0cde1f8..05ea55f 100644 --- a/arch/x86/lib/rwlock_64.S +++ b/arch/x86/lib/rwlock_64.S @@ -2,7 +2,7 @@ #include #include -#include +#include #include /* rdi: pointer to rwlock_t */ diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S index c01eb39..444fba4 100644 --- a/arch/x86/lib/semaphore_32.S +++ b/arch/x86/lib/semaphore_32.S @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include /* diff --git a/include/asm-um/alternative-asm.h b/include/asm-um/alternative-asm.h new file mode 100644 index 0000000..9aa9fa2 --- /dev/null +++ b/include/asm-um/alternative-asm.h @@ -0,0 +1,6 @@ +#ifndef __UM_ALTERNATIVE_ASM_I +#define __UM_ALTERNATIVE_ASM_I + +#include "asm/arch/alternative-asm.h" + +#endif diff --git a/include/asm-um/alternative-asm.i b/include/asm-um/alternative-asm.i deleted file mode 100644 index cae9fac..0000000 --- a/include/asm-um/alternative-asm.i +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_ALTERNATIVE_ASM_I -#define __UM_ALTERNATIVE_ASM_I - -#include "asm/arch/alternative-asm.i" - -#endif diff --git a/include/asm-um/frame.h b/include/asm-um/frame.h new file mode 100644 index 0000000..8a8c1cb --- /dev/null +++ b/include/asm-um/frame.h @@ -0,0 +1,6 @@ +#ifndef __UM_FRAME_I +#define __UM_FRAME_I + +#include "asm/arch/frame.h" + +#endif diff --git a/include/asm-um/frame.i b/include/asm-um/frame.i deleted file mode 100644 index 09d5dca..0000000 --- a/include/asm-um/frame.i +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_FRAME_I -#define __UM_FRAME_I - -#include "asm/arch/frame.i" - -#endif diff --git a/include/asm-x86/alternative-asm.h b/include/asm-x86/alternative-asm.h new file mode 100644 index 0000000..e2077d3 --- /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 4f360cd..0000000 --- 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 f051020..0000000 --- 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 0b3f1a2..0000000 --- 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.h b/include/asm-x86/frame.h new file mode 100644 index 0000000..06850a7 --- /dev/null +++ b/include/asm-x86/frame.h @@ -0,0 +1,27 @@ +#ifdef __ASSEMBLY__ + +#include + +/* The annotation hides the frame from the unwinder and makes it look + like a ordinary ebp save/restore. This avoids some special cases for + frame pointer later */ +#ifdef CONFIG_FRAME_POINTER + .macro FRAME + pushl %ebp + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET ebp,0 + movl %esp,%ebp + .endm + .macro ENDFRAME + popl %ebp + CFI_ADJUST_CFA_OFFSET -4 + CFI_RESTORE ebp + .endm +#else + .macro FRAME + .endm + .macro ENDFRAME + .endm +#endif + +#endif /* __ASSEMBLY__ */ diff --git a/include/asm-x86/frame.i b/include/asm-x86/frame.i deleted file mode 100644 index 0362025..0000000 --- a/include/asm-x86/frame.i +++ /dev/null @@ -1,23 +0,0 @@ -#include - -/* The annotation hides the frame from the unwinder and makes it look - like a ordinary ebp save/restore. This avoids some special cases for - frame pointer later */ -#ifdef CONFIG_FRAME_POINTER - .macro FRAME - pushl %ebp - CFI_ADJUST_CFA_OFFSET 4 - CFI_REL_OFFSET ebp,0 - movl %esp,%ebp - .endm - .macro ENDFRAME - popl %ebp - CFI_ADJUST_CFA_OFFSET -4 - CFI_RESTORE ebp - .endm -#else - .macro FRAME - .endm - .macro ENDFRAME - .endm -#endif -- cgit v1.1