Home » Mailing list archives » linux-kernel » 2007 » September » 21

[PATCH] [33/50] x86: rename .i assembler includes to .h

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andi Kleen <ak@...>
To: <patches@...>, <linux-kernel@...>
Subject: [PATCH] [33/50] x86: rename .i assembler includes to .h
Date: Friday, September 21, 2007 - 6:32 pm

.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__.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andi Kleen <ak@suse.de>

---

 arch/i386/lib/semaphore.S            |    4 ++--
 arch/x86_64/lib/rwlock.S             |    2 +-
 include/asm-i386/alternative-asm.h   |   16 ++++++++++++++++
 include/asm-i386/alternative-asm.i   |   12 ------------
 include/asm-i386/frame.h             |   27 +++++++++++++++++++++++++++
 include/asm-i386/frame.i             |   23 -----------------------
 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_64/alternative-asm.h |   16 ++++++++++++++++
 include/asm-x86_64/alternative-asm.i |   12 ------------
 12 files changed, 74 insertions(+), 62 deletions(-)

7b64536780b39820b13bebd144983c3c8c9ae64c 
Index: linux/arch/i386/lib/semaphore.S
===================================================================
--- linux.orig/arch/i386/lib/semaphore.S
+++ linux/arch/i386/lib/semaphore.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>
 
 /*
Index: linux/arch/x86_64/lib/rwlock.S
===================================================================
--- linux.orig/arch/x86_64/lib/rwlock.S
+++ linux/arch/x86_64/lib/rwlock.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 */
Index: linux/include/asm-i386/alternative-asm.h
===================================================================
--- /dev/null
+++ linux/include/asm-i386/alternative-asm.h
@@ -0,0 +1,16 @@
+#ifdef __ASSEMBLY__
+
+#ifdef CONFIG_SMP
+	.macro LOCK_PREFIX
+1:	lock
+	.section .smp_locks,"a"
+	.align 4
+	.long 1b
+	.previous
+	.endm
+#else
+	.macro LOCK_PREFIX
+	.endm
+#endif
+
+#endif  /*  __ASSEMBLY__  */
Index: linux/include/asm-i386/alternative-asm.i
===================================================================
--- linux.orig/include/asm-i386/alternative-asm.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
Index: linux/include/asm-i386/frame.h
===================================================================
--- /dev/null
+++ linux/include/asm-i386/frame.h
@@ -0,0 +1,27 @@
+#ifdef __ASSEMBLY__
+
+#include <asm/dwarf2.h>
+
+/* 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__  */
Index: linux/include/asm-i386/frame.i
===================================================================
--- linux.orig/include/asm-i386/frame.i
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <asm/dwarf2.h>
-
-/* 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
Index: linux/include/asm-um/alternative-asm.h
===================================================================
--- /dev/null
+++ linux/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
Index: linux/include/asm-um/alternative-asm.i
===================================================================
--- linux.orig/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
Index: linux/include/asm-um/frame.h
===================================================================
--- /dev/null
+++ linux/include/asm-um/frame.h
@@ -0,0 +1,6 @@
+#ifndef __UM_FRAME_I
+#define __UM_FRAME_I
+
+#include "asm/arch/frame.h"
+
+#endif
Index: linux/include/asm-um/frame.i
===================================================================
--- linux.orig/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
Index: linux/include/asm-x86_64/alternative-asm.h
===================================================================
--- /dev/null
+++ linux/include/asm-x86_64/alternative-asm.h
@@ -0,0 +1,16 @@
+#ifdef __ASSEMBLY__
+
+#ifdef CONFIG_SMP
+	.macro LOCK_PREFIX
+1:	lock
+	.section .smp_locks,"a"
+	.align 8
+	.quad 1b
+	.previous
+	.endm
+#else
+	.macro LOCK_PREFIX
+	.endm
+#endif
+
+#endif  /*  __ASSEMBLY__  */
Index: linux/include/asm-x86_64/alternative-asm.i
===================================================================
--- linux.orig/include/asm-x86_64/alternative-asm.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
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [0/50] x86 2.6.24 patches review II, Andi Kleen, (Fri Sep 21, 6:31 pm)
[PATCH] [49/50] x86_64: Initialize 64bit registers for a.out..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [50/50] x86_64: Remove fpu io port resource, Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Jeff Garzik, (Fri Sep 21, 7:00 pm)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Andi Kleen, (Mon Oct 1, 6:40 am)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Jeff Garzik, (Mon Oct 1, 7:30 am)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Alan Cox, (Tue Oct 2, 10:37 am)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Andi Kleen, (Mon Oct 1, 7:48 am)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Jeff Garzik, (Mon Oct 1, 9:33 am)
Re: [PATCH] [50/50] x86_64: Remove fpu io port resource, Mark Lord, (Mon Oct 1, 10:16 am)
[PATCH] [48/50] x86_64: return correct error code from child..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [46/50] x86: also show non-zero IRQ counts for vecto..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [47/50] i386: avoid temporarily inconsistent pte-s, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [45/50] x86_64: configure HPET_EMULATE_RTC automatic..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [44/50] i386: Introduce "used_vectors" bitmap which ..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [43/50] x86: multi-byte single instruction NOPs, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [42/50] i386: constify wd_ops, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [41/50] i386: fix section mismatch warning in intel.c, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [40/50] i386: Fix section mismatch, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [35/50] i386: Do cpuid_device_create() in CPU_UP_PRE..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [35/50] i386: Do cpuid_device_create() in CPU_UP..., Thomas Gleixner, (Sat Sep 22, 3:33 pm)
Re: [PATCH] [35/50] i386: Do cpuid_device_create() in CPU_UP..., Akinobu Mita, (Sat Sep 22, 9:52 pm)
Re: [PATCH] [35/50] i386: Do cpuid_device_create() in CPU_UP..., Thomas Gleixner, (Sun Sep 23, 3:52 am)
[PATCH] [39/50] i386: fix 4 bit apicid assumption of mach-de..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [38/50] x86_64: fix off-by-one in find_next_zero_str..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [36/50] x86: Use raw locks during oopses, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [37/50] x86_64: Clean up mce= argument parsing sligh..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [34/50] i386: Fix argument signedness warnings, Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [34/50] i386: Fix argument signedness warnings, Satyam Sharma, (Sat Sep 22, 1:06 am)
Re: [PATCH] [34/50] i386: Fix argument signedness warnings, Jan Engelhardt, (Sat Sep 22, 6:01 am)
Re: [PATCH] [34/50] i386: Fix argument signedness warnings, Randy Dunlap, (Sat Sep 22, 1:42 pm)
[PATCH] [33/50] x86: rename .i assembler includes to .h, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [32/50] x86: Show last exception from/to register c..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [31/50] x86_64: honor notify_die() returning NOTIFY_..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [31/50] x86_64: honor notify_die() returning NOT..., Thomas Gleixner, (Sat Sep 22, 3:23 pm)
[PATCH] [30/50] x86_64: remove some dead code, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [29/50] x86: honor _PAGE_PSE bit on page walks, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [28/50] i386: remove stub early_printk.c, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [27/50] x86_64: Remove duplicated vsyscall nsec update, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [26/50] i386: export i386 smp_call_function_mask() t..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [23/50] x86_64: Implement missing x86_64 function sm..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [25/50] x86_64: Add parenthesis to IRQ vector macros, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [24/50] x86_64: Eliminate result signage problem in ..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [22/50] i386: Misc cpuinit annotations, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [18/50] x86_64: Save registers in saved_context duri..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [21/50] i386: Misc cpuinit annotations, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [13/50] x86: Fix and reenable CLFLUSH support in cha..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [patches] [PATCH] [13/50] x86: Fix and reenable CLFLUSH ..., Jan Beulich, (Mon Sep 24, 4:23 am)
Re: [patches] [PATCH] [13/50] x86: Fix and reenable CLFLUSH ..., Andi Kleen, (Mon Oct 1, 6:38 am)
Re: [PATCH] [13/50] x86: Fix and reenable CLFLUSH support in..., Oleg Verych, (Sat Sep 22, 1:47 am)
Re: [PATCH] [13/50] x86: Fix and reenable CLFLUSH support in..., Andi Kleen, (Mon Oct 1, 6:59 am)
[PATCH] [20/50] x86_64: Fix some broken white space in arch/..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [20/50] x86_64: Fix some broken white space in a..., Thomas Gleixner, (Sat Sep 22, 3:17 pm)
Re: [PATCH] [20/50] x86_64: Fix some broken white space in a..., Oleg Verych, (Sat Sep 22, 9:47 pm)
[PATCH] [16/50] x86: Use macros to modify the PG_arch_1 page..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [19/50] Experimental: detect if SVM is disabled by B..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [19/50] Experimental: detect if SVM is disabled ..., Thomas Gleixner, (Sat Sep 22, 3:05 pm)
Re: [PATCH] [19/50] Experimental: detect if SVM is disabled ..., Joerg Roedel, (Sat Sep 22, 5:17 am)
Re: [PATCH] [19/50] Experimental: detect if SVM is disabled ..., Andi Kleen, (Mon Oct 1, 12:47 pm)
Re: [PATCH] [19/50] Experimental: detect if SVM is disabled ..., Joerg Roedel, (Mon Oct 1, 4:12 pm)
Re: [patches] [PATCH] [19/50] Experimental: detect if SVM is..., Andi Kleen, (Mon Oct 1, 5:45 pm)
Re: [patches] [PATCH] [19/50] Experimental: detect if SVM is..., Joerg Roedel, (Mon Oct 1, 6:13 pm)
Re: [PATCH] [19/50] Experimental: detect if SVM is disabled ..., Sam Ravnborg, (Sat Sep 22, 2:59 am)
[PATCH] [17/50] x86_64: remove STR() macros, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [11/50] x86_64: Install unstripped copy of 64bit vds..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [14/50] x86: Minor code-style cleanups to change_pag..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [15/50] x86_64: Return EINVAL for unknown address in..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [patches] [PATCH] [15/50] x86_64: Return EINVAL for unkn..., Jan Beulich, (Mon Sep 24, 4:32 am)
[PATCH] [12/50] x86_64: Untable __init references between IO..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [patches] [PATCH] [12/50] x86_64: Untable __init referen..., Yinghai Lu, (Sat Sep 22, 1:37 am)
[PATCH] [7/50] x86: expand /proc/interrupts to include missi..., Andi Kleen, (Fri Sep 21, 6:32 pm)
possible corrections in the docs (Re: [PATCH] [7/50] x86: ex..., Oleg Verych, (Fri Sep 21, 11:35 pm)
Re: possible corrections in the docs (Re: [PATCH] [7/50] x86..., Joe Korty, (Fri Sep 21, 11:52 pm)
[PATCH] [9/50] i386: validate against ACPI motherboard resou..., Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 2:49 am)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Robert Hancock, (Sat Sep 22, 12:28 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 4:47 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Thomas Gleixner, (Sat Sep 22, 2:01 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Robert Hancock, (Sat Sep 22, 2:42 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 4:40 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Robert Hancock, (Sat Sep 22, 5:27 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 9:34 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 9:20 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., H. Peter Anvin, (Sat Sep 22, 4:56 pm)
Re: [PATCH] [9/50] i386: validate against ACPI motherboard r..., Yinghai Lu, (Sat Sep 22, 2:56 am)
[PATCH] [10/50] x86_64: install unstripped copies of compat ..., Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [6/50] i386: clean up oops/bug reports, Andi Kleen, (Fri Sep 21, 6:32 pm)
Killing printk calls for size (Re: [PATCH] [6/50] i386: clea..., Oleg Verych, (Fri Sep 21, 10:51 pm)
Re: [PATCH] [6/50] i386: clean up oops/bug reports, Chuck Ebbert, (Fri Sep 21, 6:41 pm)
Re: [PATCH] [6/50] i386: clean up oops/bug reports, Jan Engelhardt, (Sat Sep 22, 5:47 am)
[PATCH] [8/50] x86_64: remove x86_cpu_to_log_apicid, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [5/50] i386: change order in Kconfig.cpu, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Andi Kleen, (Fri Sep 21, 6:32 pm)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Thomas Gleixner, (Sat Sep 22, 1:50 pm)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Andi Kleen, (Mon Oct 1, 7:17 am)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Dave Jones, (Fri Sep 21, 6:45 pm)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Andi Kleen, (Sun Sep 30, 6:09 am)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Sam Ravnborg, (Sat Sep 22, 2:57 am)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Dave Jones, (Sat Sep 22, 10:23 am)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Randy Dunlap, (Sat Sep 22, 1:40 pm)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Jan Engelhardt, (Sat Sep 22, 5:46 am)
Re: [PATCH] [4/50] x86: add cpu codenames for Kconfig.cpu, Alan Cox, (Fri Sep 21, 7:52 pm)
[PATCH] [3/50] x86_64: remove never used apic_mapped, Andi Kleen, (Fri Sep 21, 6:32 pm)
[PATCH] [2/50] x86_64: use core id bits for apicid_to_node i..., Andi Kleen, (Fri Sep 21, 6:31 pm)
[PATCH] [1/50] x86_64: store core id bits in cpuinfo_x8, Andi Kleen, (Fri Sep 21, 6:31 pm)