update .gitignore

PATCH In review Adrian Bunk 4 participants 6 messages Aug 1, 2007 – Aug 29, 2007 User-mode Linux (UML)

lore

Share & tools

lore

Adrian Bunk

author

2007-08-01 13:11 UTC #0 lore raw

PATCH 1/1 update .gitignore

Some shipped files were wrongly ignored by git.

Signed-off-by Adrian Bunk <[email protected]>

---

 .gitignore |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

.gitignore renamed from .gitignore.old +8 -1

@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i
 *.lst
 *.symtypes
 
+# .gitignore files
+!.gitignore
+
 #
 # Top-level generic files
 #
 tags
 TAGS
 vmlinux*
-!vmlinux.lds.S
+!vmlinux*.lds*
+!vmlinux*.scr
 System.map
 Module.symvers
+!.mailmap
+!.mm
 
 #
 # Generated include files

Alexey Dobriyan

2007-08-01 19:08 UTC #1 lore raw

.gitignore line 17

Quoted 7 lines · Adrian Bunk

.gitignore renamed from .gitignore.old +1 -0
@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i

I think these should be renamed to .S and let .i alone for preprocessed stuff.

Quoted 16 lines

.gitignore renamed from .gitignore.old +7 -1

+# .gitignore files
+!.gitignore
+
 #
 # Top-level generic files
 #
 tags
 TAGS
 vmlinux*
-!vmlinux.lds.S
+!vmlinux*.lds*
+!vmlinux*.scr
 System.map
 Module.symvers
+!.mailmap
+!.mm

Adrian Bunk

author

2007-08-01 19:11 UTC #2 lore raw

Quoted 12 lines · Alexey Dobriyan

.gitignore line 17
Quoted 7 lines · Adrian Bunk
.gitignore renamed from .gitignore.old +1 -0
@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i
I think these should be renamed to .S and let .i alone for preprocessed stuff.
...

Fine with me if Andi agrees.

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Adrian Bunk

2007-08-19 23:02 UTC #3 lore raw

Quoted 14 lines · Adrian Bunk

Quoted 12 lines · Alexey Dobriyan
.gitignore line 17
Quoted 7 lines · Adrian Bunk
.gitignore renamed from .gitignore.old +1 -0
@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i
I think these should be renamed to .S and let .i alone for preprocessed stuff.
...

Quoted 1 line

Fine with me if Andi agrees.

Andi?

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Andi Kleen

2007-08-20 00:16 UTC #4 lore raw

Quoted 15 lines · Adrian Bunk

Quoted 14 lines · Adrian Bunk
Quoted 12 lines · Alexey Dobriyan
.gitignore line 17
Quoted 7 lines · Adrian Bunk
.gitignore renamed from .gitignore.old +1 -0
@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i
I think these should be renamed to .S and let .i alone for preprocessed stuff.
...

Quoted 3 lines

Quoted 1 line
Fine with me if Andi agrees.
Andi?

Hmm, perhaps rename alternative-asm.i to .h and stick a #ifdef __ASSEMBLY__ around it.

There is actually only one includer currently, but there might be more in the future again.

-Andi

Adrian Bunk

2007-08-29 23:29 UTC #5 lore raw

PATCH 1/1 rename .i assembler includes to .h

Quoted 16 lines · Andi Kleen

Quoted 15 lines · Adrian Bunk
Quoted 14 lines · Adrian Bunk
Quoted 12 lines · Alexey Dobriyan
.gitignore line 17
Quoted 7 lines · Adrian Bunk
.gitignore renamed from .gitignore.old +1 -0
@@ -14,18 +14,25 @@
 *.so
 *.mod.c
 *.i
+!include/asm-*/*.i
I think these should be renamed to .S and let .i alone for preprocessed stuff.
...

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
Fine with me if Andi agrees.
Andi?
Hmm, perhaps rename alternative-asm.i to .h and stick a #ifdef __ASSEMBLY__ around it.

Patch below.

Quoted 4 lines

There is actually only one includer currently, but there might be more in the future again.
-Andi

cu
Adrian

<-- snip -->

.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 <[email protected]>

---

 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

arch/i386/lib/semaphore.S +2 -2

index c01eb39..444fba4 100644
@@ -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>
 
 /*

arch/x86_64/lib/rwlock.S +1 -1

index 0cde1f8..05ea55f 100644
@@ -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 */

include/asm-i386/alternative-asm.h new file +16 -0

new file mode 100644
index 0000000..c478a03
@@ -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__  */

include/asm-i386/alternative-asm.i deleted +0 ~~-12~~

deleted file mode 100644
index f051020..0000000
@@ -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

include/asm-i386/frame.h new file +27 -0

new file mode 100644
index 0000000..06850a7
@@ -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__  */

include/asm-i386/frame.i deleted +0 ~~-23~~

deleted file mode 100644
index 0362025..0000000
@@ -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

include/asm-um/alternative-asm.h new file +6 -0

new file mode 100644
index 0000000..9aa9fa2
@@ -0,0 +1,6 @@
+#ifndef __UM_ALTERNATIVE_ASM_I
+#define __UM_ALTERNATIVE_ASM_I
+
+#include "asm/arch/alternative-asm.h"
+
+#endif

include/asm-um/alternative-asm.i deleted +0 -6

deleted file mode 100644
index cae9fac..0000000
@@ -1,6 +0,0 @@
-#ifndef __UM_ALTERNATIVE_ASM_I
-#define __UM_ALTERNATIVE_ASM_I
-
-#include "asm/arch/alternative-asm.i"
-
-#endif

include/asm-um/frame.h new file +6 -0

new file mode 100644
index 0000000..8a8c1cb
@@ -0,0 +1,6 @@
+#ifndef __UM_FRAME_I
+#define __UM_FRAME_I
+
+#include "asm/arch/frame.h"
+
+#endif

include/asm-um/frame.i deleted +0 -6

deleted file mode 100644
index 09d5dca..0000000
@@ -1,6 +0,0 @@
-#ifndef __UM_FRAME_I
-#define __UM_FRAME_I
-
-#include "asm/arch/frame.i"
-
-#endif

include/asm-x86_64/alternative-asm.h new file +16 -0

new file mode 100644
index 0000000..b598daf
@@ -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__  */

include/asm-x86_64/alternative-asm.i deleted +0 ~~-12~~

deleted file mode 100644
index 0b3f1a2..0000000
@@ -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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel