Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

author: Linus Torvalds <torvalds@g5.osdl.org> 2005-09-09 18:46:49 -0400
committer: Linus Torvalds <torvalds@g5.osdl.org> 2005-09-09 18:46:49 -0400
commit: 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch)
tree: f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/arm/mm
parent: 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff)
parent: f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff)
18 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S
index 4940f1908316..3c58ebbf0359 100644
--- a/arch/arm/mm/copypage-v3.S
+++ b/arch/arm/mm/copypage-v3.S
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
                .text
                .align  5
diff --git a/arch/arm/mm/copypage-v4wb.S b/arch/arm/mm/copypage-v4wb.S
index b94c345ceb94..83117354b1cd 100644
--- a/arch/arm/mm/copypage-v4wb.S
+++ b/arch/arm/mm/copypage-v4wb.S
@@ -11,7 +11,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
        .text
        .align  5
diff --git a/arch/arm/mm/copypage-v4wt.S b/arch/arm/mm/copypage-v4wt.S
index 976793937a93..e1f2af28d549 100644
--- a/arch/arm/mm/copypage-v4wt.S
+++ b/arch/arm/mm/copypage-v4wt.S
@@ -14,7 +14,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
        .text
        .align  5
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 5c0ae5260d1c..1d739d282a45 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -28,7 +28,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index d69389c4d4ba..9b725665b5c7 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -28,7 +28,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 747ed963e1df..37b70fa21c76 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -17,7 +17,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 248110c9cf13..931b690d1be2 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -17,7 +17,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 189ef6a71ba1..d0f1bbb48f6c 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -13,7 +13,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 57cfa6a2f54f..c69c9de32391 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -33,7 +33,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 9137fe563599..7cfc2604a1ee 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -4,7 +4,7 @@
 *  VMA_VM_FLAGS
 *  VM_EXEC
 */
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 /*
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 360cae905692..34f7e7d3f419 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -15,7 +15,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index d447cd5f3dd9..ca14f80d5ab4 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -20,7 +20,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 139a38670c5d..eb34823c9dbf 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -11,7 +11,7 @@
 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mm/tlb-v3.S b/arch/arm/mm/tlb-v3.S
index 44b0daeaff9b..c10786ec8e0a 100644
--- a/arch/arm/mm/tlb-v3.S
+++ b/arch/arm/mm/tlb-v3.S
@@ -13,7 +13,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
diff --git a/arch/arm/mm/tlb-v4.S b/arch/arm/mm/tlb-v4.S
index db82ee468248..d6c94457c2b9 100644
--- a/arch/arm/mm/tlb-v4.S
+++ b/arch/arm/mm/tlb-v4.S
@@ -14,7 +14,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
diff --git a/arch/arm/mm/tlb-v4wb.S b/arch/arm/mm/tlb-v4wb.S
index 7908d5f1f130..cb829ca7845d 100644
--- a/arch/arm/mm/tlb-v4wb.S
+++ b/arch/arm/mm/tlb-v4wb.S
@@ -14,7 +14,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S
index efbe94bbe1a7..60cfc4a25dd5 100644
--- a/arch/arm/mm/tlb-v4wbi.S
+++ b/arch/arm/mm/tlb-v4wbi.S
@@ -14,7 +14,7 @@
 */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S
index 99ed26e78adf..6f76b89ef46e 100644
--- a/arch/arm/mm/tlb-v6.S
+++ b/arch/arm/mm/tlb-v6.S
@@ -11,7 +11,7 @@
 *  These assume a split I/D TLB.
 */
 #include <linux/linkage.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
author	Linus Torvalds <torvalds@g5.osdl.org>	2005-09-09 18:46:49 -0400
committer	Linus Torvalds <torvalds@g5.osdl.org>	2005-09-09 18:46:49 -0400
commit	486a153f0e294f7cc735838edcb6b32e623cbe52 (patch)
tree	f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/arm/mm
parent	9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff)
parent	f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff)

diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S index 4940f1908316..3c58ebbf0359 100644 --- a/arch/arm/mm/copypage-v3.S +++ b/arch/arm/mm/copypage-v3.S
@@ -12,7 +12,7 @@
12	#include <linux/linkage.h>	12	#include <linux/linkage.h>
13	#include <linux/init.h>	13	#include <linux/init.h>
14	#include <asm/assembler.h>	14	#include <asm/assembler.h>
15	#include <asm/constants.h>	15	#include <asm/asm-offsets.h>
16		16
17	.text	17	.text
18	.align 5	18	.align 5


diff --git a/arch/arm/mm/copypage-v4wb.S b/arch/arm/mm/copypage-v4wb.S index b94c345ceb94..83117354b1cd 100644 --- a/arch/arm/mm/copypage-v4wb.S +++ b/arch/arm/mm/copypage-v4wb.S
@@ -11,7 +11,7 @@
11	*/	11	*/
12	#include <linux/linkage.h>	12	#include <linux/linkage.h>
13	#include <linux/init.h>	13	#include <linux/init.h>
14	#include <asm/constants.h>	14	#include <asm/asm-offsets.h>
15		15
16	.text	16	.text
17	.align 5	17	.align 5


diff --git a/arch/arm/mm/copypage-v4wt.S b/arch/arm/mm/copypage-v4wt.S index 976793937a93..e1f2af28d549 100644 --- a/arch/arm/mm/copypage-v4wt.S +++ b/arch/arm/mm/copypage-v4wt.S
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#include <linux/linkage.h>	15	#include <linux/linkage.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <asm/constants.h>	17	#include <asm/asm-offsets.h>
18		18
19	.text	19	.text
20	.align 5	20	.align 5


diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S index 5c0ae5260d1c..1d739d282a45 100644 --- a/arch/arm/mm/proc-arm1020.S +++ b/arch/arm/mm/proc-arm1020.S
@@ -28,7 +28,7 @@
28	#include <linux/config.h>	28	#include <linux/config.h>
29	#include <linux/init.h>	29	#include <linux/init.h>
30	#include <asm/assembler.h>	30	#include <asm/assembler.h>
31	#include <asm/constants.h>	31	#include <asm/asm-offsets.h>
32	#include <asm/pgtable.h>	32	#include <asm/pgtable.h>
33	#include <asm/procinfo.h>	33	#include <asm/procinfo.h>
34	#include <asm/ptrace.h>	34	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index d69389c4d4ba..9b725665b5c7 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S
@@ -28,7 +28,7 @@
28	#include <linux/config.h>	28	#include <linux/config.h>
29	#include <linux/init.h>	29	#include <linux/init.h>
30	#include <asm/assembler.h>	30	#include <asm/assembler.h>
31	#include <asm/constants.h>	31	#include <asm/asm-offsets.h>
32	#include <asm/pgtable.h>	32	#include <asm/pgtable.h>
33	#include <asm/procinfo.h>	33	#include <asm/procinfo.h>
34	#include <asm/ptrace.h>	34	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S index 747ed963e1df..37b70fa21c76 100644 --- a/arch/arm/mm/proc-arm1022.S +++ b/arch/arm/mm/proc-arm1022.S
@@ -17,7 +17,7 @@
17	#include <linux/config.h>	17	#include <linux/config.h>
18	#include <linux/init.h>	18	#include <linux/init.h>
19	#include <asm/assembler.h>	19	#include <asm/assembler.h>
20	#include <asm/constants.h>	20	#include <asm/asm-offsets.h>
21	#include <asm/pgtable.h>	21	#include <asm/pgtable.h>
22	#include <asm/procinfo.h>	22	#include <asm/procinfo.h>
23	#include <asm/ptrace.h>	23	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index 248110c9cf13..931b690d1be2 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S
@@ -17,7 +17,7 @@
17	#include <linux/config.h>	17	#include <linux/config.h>
18	#include <linux/init.h>	18	#include <linux/init.h>
19	#include <asm/assembler.h>	19	#include <asm/assembler.h>
20	#include <asm/constants.h>	20	#include <asm/asm-offsets.h>
21	#include <asm/pgtable.h>	21	#include <asm/pgtable.h>
22	#include <asm/procinfo.h>	22	#include <asm/procinfo.h>
23	#include <asm/ptrace.h>	23	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 189ef6a71ba1..d0f1bbb48f6c 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S
@@ -13,7 +13,7 @@
13	#include <linux/linkage.h>	13	#include <linux/linkage.h>
14	#include <linux/init.h>	14	#include <linux/init.h>
15	#include <asm/assembler.h>	15	#include <asm/assembler.h>
16	#include <asm/constants.h>	16	#include <asm/asm-offsets.h>
17	#include <asm/pgtable.h>	17	#include <asm/pgtable.h>
18	#include <asm/procinfo.h>	18	#include <asm/procinfo.h>
19	#include <asm/ptrace.h>	19	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S index 57cfa6a2f54f..c69c9de32391 100644 --- a/arch/arm/mm/proc-arm720.S +++ b/arch/arm/mm/proc-arm720.S
@@ -33,7 +33,7 @@
33	#include <linux/linkage.h>	33	#include <linux/linkage.h>
34	#include <linux/init.h>	34	#include <linux/init.h>
35	#include <asm/assembler.h>	35	#include <asm/assembler.h>
36	#include <asm/constants.h>	36	#include <asm/asm-offsets.h>
37	#include <asm/pgtable.h>	37	#include <asm/pgtable.h>
38	#include <asm/procinfo.h>	38	#include <asm/procinfo.h>
39	#include <asm/ptrace.h>	39	#include <asm/ptrace.h>


diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 9137fe563599..7cfc2604a1ee 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S
@@ -4,7 +4,7 @@
4	* VMA_VM_FLAGS	4	* VMA_VM_FLAGS
5	* VM_EXEC	5	* VM_EXEC
6	*/	6	*/
7	#include <asm/constants.h>	7	#include <asm/asm-offsets.h>
8	#include <asm/thread_info.h>	8	#include <asm/thread_info.h>
9		9
10	/*	10	/*


diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S index 360cae905692..34f7e7d3f419 100644 --- a/arch/arm/mm/proc-sa110.S +++ b/arch/arm/mm/proc-sa110.S
@@ -15,7 +15,7 @@
15	#include <linux/linkage.h>	15	#include <linux/linkage.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <asm/assembler.h>	17	#include <asm/assembler.h>
18	#include <asm/constants.h>	18	#include <asm/asm-offsets.h>
19	#include <asm/procinfo.h>	19	#include <asm/procinfo.h>
20	#include <asm/hardware.h>	20	#include <asm/hardware.h>
21	#include <asm/pgtable.h>	21	#include <asm/pgtable.h>


diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index d447cd5f3dd9..ca14f80d5ab4 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S
@@ -20,7 +20,7 @@
20	#include <linux/linkage.h>	20	#include <linux/linkage.h>
21	#include <linux/init.h>	21	#include <linux/init.h>
22	#include <asm/assembler.h>	22	#include <asm/assembler.h>
23	#include <asm/constants.h>	23	#include <asm/asm-offsets.h>
24	#include <asm/procinfo.h>	24	#include <asm/procinfo.h>
25	#include <asm/hardware.h>	25	#include <asm/hardware.h>
26	#include <asm/pgtable.h>	26	#include <asm/pgtable.h>


diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 139a38670c5d..eb34823c9dbf 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S
@@ -11,7 +11,7 @@
11	*/	11	*/
12	#include <linux/linkage.h>	12	#include <linux/linkage.h>
13	#include <asm/assembler.h>	13	#include <asm/assembler.h>
14	#include <asm/constants.h>	14	#include <asm/asm-offsets.h>
15	#include <asm/procinfo.h>	15	#include <asm/procinfo.h>
16	#include <asm/pgtable.h>	16	#include <asm/pgtable.h>
17		17


diff --git a/arch/arm/mm/tlb-v3.S b/arch/arm/mm/tlb-v3.S index 44b0daeaff9b..c10786ec8e0a 100644 --- a/arch/arm/mm/tlb-v3.S +++ b/arch/arm/mm/tlb-v3.S
@@ -13,7 +13,7 @@
13	*/	13	*/
14	#include <linux/linkage.h>	14	#include <linux/linkage.h>
15	#include <linux/init.h>	15	#include <linux/init.h>
16	#include <asm/constants.h>	16	#include <asm/asm-offsets.h>
17	#include <asm/tlbflush.h>	17	#include <asm/tlbflush.h>
18	#include "proc-macros.S"	18	#include "proc-macros.S"
19		19


diff --git a/arch/arm/mm/tlb-v4.S b/arch/arm/mm/tlb-v4.S index db82ee468248..d6c94457c2b9 100644 --- a/arch/arm/mm/tlb-v4.S +++ b/arch/arm/mm/tlb-v4.S
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#include <linux/linkage.h>	15	#include <linux/linkage.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <asm/constants.h>	17	#include <asm/asm-offsets.h>
18	#include <asm/tlbflush.h>	18	#include <asm/tlbflush.h>
19	#include "proc-macros.S"	19	#include "proc-macros.S"
20		20


diff --git a/arch/arm/mm/tlb-v4wb.S b/arch/arm/mm/tlb-v4wb.S index 7908d5f1f130..cb829ca7845d 100644 --- a/arch/arm/mm/tlb-v4wb.S +++ b/arch/arm/mm/tlb-v4wb.S
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#include <linux/linkage.h>	15	#include <linux/linkage.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <asm/constants.h>	17	#include <asm/asm-offsets.h>
18	#include <asm/tlbflush.h>	18	#include <asm/tlbflush.h>
19	#include "proc-macros.S"	19	#include "proc-macros.S"
20		20


diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S index efbe94bbe1a7..60cfc4a25dd5 100644 --- a/arch/arm/mm/tlb-v4wbi.S +++ b/arch/arm/mm/tlb-v4wbi.S
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#include <linux/linkage.h>	15	#include <linux/linkage.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <asm/constants.h>	17	#include <asm/asm-offsets.h>
18	#include <asm/tlbflush.h>	18	#include <asm/tlbflush.h>
19	#include "proc-macros.S"	19	#include "proc-macros.S"
20		20


diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S index 99ed26e78adf..6f76b89ef46e 100644 --- a/arch/arm/mm/tlb-v6.S +++ b/arch/arm/mm/tlb-v6.S
@@ -11,7 +11,7 @@
11	* These assume a split I/D TLB.	11	* These assume a split I/D TLB.
12	*/	12	*/
13	#include <linux/linkage.h>	13	#include <linux/linkage.h>
14	#include <asm/constants.h>	14	#include <asm/asm-offsets.h>
15	#include <asm/page.h>	15	#include <asm/page.h>
16	#include <asm/tlbflush.h>	16	#include <asm/tlbflush.h>
17	#include "proc-macros.S"	17	#include "proc-macros.S"