* [2.6 patch] update .gitignore
@ 2007-08-01 13:10 Adrian Bunk
2007-08-01 19:07 ` Alexey Dobriyan
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2007-08-01 13:10 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Some shipped files were wrongly ignored by git.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
.gitignore | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- linux-2.6.23-rc1-mm2/.gitignore.old 2007-08-01 14:12:43.000000000 +0200
+++ linux-2.6.23-rc1-mm2/.gitignore 2007-08-01 14:52:51.000000000 +0200
@@ -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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] update .gitignore
2007-08-01 13:10 [2.6 patch] update .gitignore Adrian Bunk
@ 2007-08-01 19:07 ` Alexey Dobriyan
2007-08-01 19:10 ` Adrian Bunk
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Dobriyan @ 2007-08-01 19:07 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel
On Wed, Aug 01, 2007 at 03:10:51PM +0200, Adrian Bunk wrote:
> --- linux-2.6.23-rc1-mm2/.gitignore.old
> +++ linux-2.6.23-rc1-mm2/.gitignore
> @@ -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.
> +# .gitignore files
> +!.gitignore
> +
> #
> # Top-level generic files
> #
> tags
> TAGS
> vmlinux*
> -!vmlinux.lds.S
> +!vmlinux*.lds*
> +!vmlinux*.scr
> System.map
> Module.symvers
> +!.mailmap
> +!.mm
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] update .gitignore
2007-08-01 19:07 ` Alexey Dobriyan
@ 2007-08-01 19:10 ` Adrian Bunk
2007-08-19 23:01 ` Adrian Bunk
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2007-08-01 19:10 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Andrew Morton, linux-kernel, Andi Kleen
On Wed, Aug 01, 2007 at 11:07:53PM +0400, Alexey Dobriyan wrote:
> On Wed, Aug 01, 2007 at 03:10:51PM +0200, Adrian Bunk wrote:
> > --- linux-2.6.23-rc1-mm2/.gitignore.old
> > +++ linux-2.6.23-rc1-mm2/.gitignore
> > @@ -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
--
"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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] update .gitignore
2007-08-01 19:10 ` Adrian Bunk
@ 2007-08-19 23:01 ` Adrian Bunk
2007-08-20 0:16 ` Andi Kleen
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2007-08-19 23:01 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Andrew Morton, linux-kernel, Andi Kleen
On Wed, Aug 01, 2007 at 09:10:37PM +0200, Adrian Bunk wrote:
> On Wed, Aug 01, 2007 at 11:07:53PM +0400, Alexey Dobriyan wrote:
> > On Wed, Aug 01, 2007 at 03:10:51PM +0200, Adrian Bunk wrote:
> > > --- linux-2.6.23-rc1-mm2/.gitignore.old
> > > +++ linux-2.6.23-rc1-mm2/.gitignore
> > > @@ -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.
Andi?
cu
Adrian
--
"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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] update .gitignore
2007-08-19 23:01 ` Adrian Bunk
@ 2007-08-20 0:16 ` Andi Kleen
2007-08-29 23:29 ` [2.6 patch] rename .i assembler includes to .h Adrian Bunk
0 siblings, 1 reply; 7+ messages in thread
From: Andi Kleen @ 2007-08-20 0:16 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Alexey Dobriyan, Andrew Morton, linux-kernel, Andi Kleen
On Mon, Aug 20, 2007 at 01:01:36AM +0200, Adrian Bunk wrote:
> On Wed, Aug 01, 2007 at 09:10:37PM +0200, Adrian Bunk wrote:
> > On Wed, Aug 01, 2007 at 11:07:53PM +0400, Alexey Dobriyan wrote:
> > > On Wed, Aug 01, 2007 at 03:10:51PM +0200, Adrian Bunk wrote:
> > > > --- linux-2.6.23-rc1-mm2/.gitignore.old
> > > > +++ linux-2.6.23-rc1-mm2/.gitignore
> > > > @@ -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.
>
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [2.6 patch] update .gitignore
@ 2007-08-29 23:29 Adrian Bunk
0 siblings, 0 replies; 7+ messages in thread
From: Adrian Bunk @ 2007-08-29 23:29 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Some shipped files were wrongly ignored by git.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
.gitignore | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
45a1318453ecc5fa346d323e8d806a5630a7191c
diff --git a/.gitignore b/.gitignore
index 27c3e83..80d891b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,15 +17,21 @@
*.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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [2.6 patch] rename .i assembler includes to .h
2007-08-20 0:16 ` Andi Kleen
@ 2007-08-29 23:29 ` Adrian Bunk
0 siblings, 0 replies; 7+ messages in thread
From: Adrian Bunk @ 2007-08-29 23:29 UTC (permalink / raw)
To: Andi Kleen, jdike
Cc: Alexey Dobriyan, Andrew Morton, linux-kernel, discuss,
user-mode-linux-devel
On Mon, Aug 20, 2007 at 02:16:46AM +0200, Andi Kleen wrote:
> On Mon, Aug 20, 2007 at 01:01:36AM +0200, Adrian Bunk wrote:
> > On Wed, Aug 01, 2007 at 09:10:37PM +0200, Adrian Bunk wrote:
> > > On Wed, Aug 01, 2007 at 11:07:53PM +0400, Alexey Dobriyan wrote:
> > > > On Wed, Aug 01, 2007 at 03:10:51PM +0200, Adrian Bunk wrote:
> > > > > --- linux-2.6.23-rc1-mm2/.gitignore.old
> > > > > +++ linux-2.6.23-rc1-mm2/.gitignore
> > > > > @@ -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.
> >
> > Andi?
>
> Hmm, perhaps rename alternative-asm.i to .h and stick a #ifdef __ASSEMBLY__
> around it.
Patch below.
> 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 <bunk@kernel.org>
---
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
diff --git a/arch/i386/lib/semaphore.S b/arch/i386/lib/semaphore.S
index c01eb39..444fba4 100644
--- a/arch/i386/lib/semaphore.S
+++ b/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>
/*
diff --git a/arch/x86_64/lib/rwlock.S b/arch/x86_64/lib/rwlock.S
index 0cde1f8..05ea55f 100644
--- a/arch/x86_64/lib/rwlock.S
+++ b/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 */
diff --git a/include/asm-i386/alternative-asm.h b/include/asm-i386/alternative-asm.h
new file mode 100644
index 0000000..c478a03
--- /dev/null
+++ b/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__ */
diff --git a/include/asm-i386/alternative-asm.i b/include/asm-i386/alternative-asm.i
deleted file mode 100644
index f051020..0000000
--- a/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
diff --git a/include/asm-i386/frame.h b/include/asm-i386/frame.h
new file mode 100644
index 0000000..06850a7
--- /dev/null
+++ b/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__ */
diff --git a/include/asm-i386/frame.i b/include/asm-i386/frame.i
deleted file mode 100644
index 0362025..0000000
--- a/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
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_64/alternative-asm.h b/include/asm-x86_64/alternative-asm.h
new file mode 100644
index 0000000..b598daf
--- /dev/null
+++ b/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__ */
diff --git a/include/asm-x86_64/alternative-asm.i b/include/asm-x86_64/alternative-asm.i
deleted file mode 100644
index 0b3f1a2..0000000
--- a/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
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-08-29 23:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-01 13:10 [2.6 patch] update .gitignore Adrian Bunk
2007-08-01 19:07 ` Alexey Dobriyan
2007-08-01 19:10 ` Adrian Bunk
2007-08-19 23:01 ` Adrian Bunk
2007-08-20 0:16 ` Andi Kleen
2007-08-29 23:29 ` [2.6 patch] rename .i assembler includes to .h Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2007-08-29 23:29 [2.6 patch] update .gitignore Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox