diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm26/Makefile | 10 | ||||
-rw-r--r-- | arch/arm26/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/arm26/lib/copy_page.S | 2 | ||||
-rw-r--r-- | arch/arm26/lib/csumpartialcopyuser.S | 2 | ||||
-rw-r--r-- | arch/arm26/lib/getuser.S | 2 | ||||
-rw-r--r-- | arch/arm26/lib/putuser.S | 2 | ||||
-rw-r--r-- | arch/arm26/mm/proc-funcs.S | 2 | ||||
-rw-r--r-- | arch/arm26/nwfpe/entry.S | 2 | ||||
-rw-r--r-- | arch/sparc/Makefile | 12 | ||||
-rw-r--r-- | arch/sparc/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/sclow.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/hypersparc.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/swift.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/tsunami.S | 2 | ||||
-rw-r--r-- | arch/sparc/mm/viking.S | 2 |
15 files changed, 14 insertions, 34 deletions
diff --git a/arch/arm26/Makefile b/arch/arm26/Makefile index e9cb8ef4f3fb..844a9e46886e 100644 --- a/arch/arm26/Makefile +++ b/arch/arm26/Makefile | |||
@@ -49,10 +49,6 @@ all: zImage | |||
49 | 49 | ||
50 | boot := arch/arm26/boot | 50 | boot := arch/arm26/boot |
51 | 51 | ||
52 | prepare: include/asm-$(ARCH)/asm_offsets.h | ||
53 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h | ||
54 | |||
55 | |||
56 | .PHONY: maketools FORCE | 52 | .PHONY: maketools FORCE |
57 | maketools: FORCE | 53 | maketools: FORCE |
58 | 54 | ||
@@ -94,12 +90,6 @@ zi:; $(Q)$(MAKE) $(build)=$(boot) zinstall | |||
94 | fi; \ | 90 | fi; \ |
95 | ) | 91 | ) |
96 | 92 | ||
97 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
98 | include/config/MARKER | ||
99 | |||
100 | include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
101 | $(call filechk,gen-asm-offsets) | ||
102 | |||
103 | define archhelp | 93 | define archhelp |
104 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' | 94 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' |
105 | echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' | 95 | echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' |
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S index a231dd88d0e1..6d910ea43d34 100644 --- a/arch/arm26/kernel/entry.S +++ b/arch/arm26/kernel/entry.S | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
11 | 11 | ||
12 | #include <asm/assembler.h> | 12 | #include <asm/assembler.h> |
13 | #include <asm/asm_offsets.h> | 13 | #include <asm/asm-offsets.h> |
14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
15 | #include <asm/hardware.h> | 15 | #include <asm/hardware.h> |
16 | #include <asm/sysirq.h> | 16 | #include <asm/sysirq.h> |
diff --git a/arch/arm26/lib/copy_page.S b/arch/arm26/lib/copy_page.S index 2d79ee12ea1f..c7511a2739d3 100644 --- a/arch/arm26/lib/copy_page.S +++ b/arch/arm26/lib/copy_page.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/asm_offsets.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | .text | 16 | .text |
17 | .align 5 | 17 | .align 5 |
diff --git a/arch/arm26/lib/csumpartialcopyuser.S b/arch/arm26/lib/csumpartialcopyuser.S index 5b821188e479..261dd154c1a4 100644 --- a/arch/arm26/lib/csumpartialcopyuser.S +++ b/arch/arm26/lib/csumpartialcopyuser.S | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/linkage.h> | 11 | #include <linux/linkage.h> |
12 | #include <asm/assembler.h> | 12 | #include <asm/assembler.h> |
13 | #include <asm/errno.h> | 13 | #include <asm/errno.h> |
14 | #include <asm/asm_offsets.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | .text | 16 | .text |
17 | 17 | ||
diff --git a/arch/arm26/lib/getuser.S b/arch/arm26/lib/getuser.S index e6d59b334851..2b1de7fbfe1f 100644 --- a/arch/arm26/lib/getuser.S +++ b/arch/arm26/lib/getuser.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000. | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000. |
27 | * Note also that it is intended that __get_user_bad is not global. | 27 | * Note also that it is intended that __get_user_bad is not global. |
28 | */ | 28 | */ |
29 | #include <asm/asm_offsets.h> | 29 | #include <asm/asm-offsets.h> |
30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
32 | 32 | ||
diff --git a/arch/arm26/lib/putuser.S b/arch/arm26/lib/putuser.S index 87588cbe46ae..46c7f15f9f2d 100644 --- a/arch/arm26/lib/putuser.S +++ b/arch/arm26/lib/putuser.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000 | 26 | * Note that ADDR_LIMIT is either 0 or 0xc0000000 |
27 | * Note also that it is intended that __put_user_bad is not global. | 27 | * Note also that it is intended that __put_user_bad is not global. |
28 | */ | 28 | */ |
29 | #include <asm/asm_offsets.h> | 29 | #include <asm/asm-offsets.h> |
30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
32 | 32 | ||
diff --git a/arch/arm26/mm/proc-funcs.S b/arch/arm26/mm/proc-funcs.S index c3d4cd3f457e..f9fca524c57a 100644 --- a/arch/arm26/mm/proc-funcs.S +++ b/arch/arm26/mm/proc-funcs.S | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <asm/assembler.h> | 16 | #include <asm/assembler.h> |
17 | #include <asm/asm_offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/procinfo.h> | 18 | #include <asm/procinfo.h> |
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | 20 | ||
diff --git a/arch/arm26/nwfpe/entry.S b/arch/arm26/nwfpe/entry.S index 7d6dfaad80c2..e6312000d9f8 100644 --- a/arch/arm26/nwfpe/entry.S +++ b/arch/arm26/nwfpe/entry.S | |||
@@ -20,7 +20,7 @@ | |||
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <asm/asm_offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | 24 | ||
25 | /* This is the kernel's entry point into the floating point emulator. | 25 | /* This is the kernel's entry point into the floating point emulator. |
26 | It is called from the kernel with code similar to this: | 26 | It is called from the kernel with code similar to this: |
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 7b3bbaf083a6..dea48f6cff38 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
@@ -59,17 +59,7 @@ image tftpboot.img: vmlinux | |||
59 | archclean: | 59 | archclean: |
60 | $(Q)$(MAKE) $(clean)=$(boot) | 60 | $(Q)$(MAKE) $(clean)=$(boot) |
61 | 61 | ||
62 | prepare: include/asm-$(ARCH)/asm_offsets.h | 62 | CLEAN_FILES += arch/$(ARCH)/boot/System.map |
63 | |||
64 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
65 | include/config/MARKER | ||
66 | |||
67 | include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
68 | $(call filechk,gen-asm-offsets) | ||
69 | |||
70 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h \ | ||
71 | arch/$(ARCH)/kernel/asm-offsets.s \ | ||
72 | arch/$(ARCH)/boot/System.map | ||
73 | 63 | ||
74 | # Don't use tabs in echo arguments. | 64 | # Don't use tabs in echo arguments. |
75 | define archhelp | 65 | define archhelp |
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index b448166f5da9..03ecb4e4614e 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/kgdb.h> | 17 | #include <asm/kgdb.h> |
18 | #include <asm/contregs.h> | 18 | #include <asm/contregs.h> |
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | #include <asm/asm_offsets.h> | 20 | #include <asm/asm-offsets.h> |
21 | #include <asm/psr.h> | 21 | #include <asm/psr.h> |
22 | #include <asm/vaddrs.h> | 22 | #include <asm/vaddrs.h> |
23 | #include <asm/memreg.h> | 23 | #include <asm/memreg.h> |
diff --git a/arch/sparc/kernel/sclow.S b/arch/sparc/kernel/sclow.S index 3a867fc19927..136e37c53d49 100644 --- a/arch/sparc/kernel/sclow.S +++ b/arch/sparc/kernel/sclow.S | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
10 | #include <asm/asm_offsets.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
12 | #include <asm/winmacro.h> | 12 | #include <asm/winmacro.h> |
13 | #include <asm/thread_info.h> | 13 | #include <asm/thread_info.h> |
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index 54b8e764b042..a231cca37216 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #include <asm/ptrace.h> | 7 | #include <asm/ptrace.h> |
8 | #include <asm/psr.h> | 8 | #include <asm/psr.h> |
9 | #include <asm/asm_offsets.h> | 9 | #include <asm/asm-offsets.h> |
10 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
11 | #include <asm/page.h> | 11 | #include <asm/page.h> |
12 | #include <asm/pgtsrmmu.h> | 12 | #include <asm/pgtsrmmu.h> |
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index 2dcaa5ac1a38..cd90f3fdc4e7 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <asm/asi.h> | 9 | #include <asm/asi.h> |
10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
11 | #include <asm/pgtsrmmu.h> | 11 | #include <asm/pgtsrmmu.h> |
12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
13 | 13 | ||
14 | .text | 14 | .text |
15 | .align 4 | 15 | .align 4 |
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 8acd1787fde2..697af617594a 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
8 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
9 | #include <asm/asm_offsets.h> | 9 | #include <asm/asm-offsets.h> |
10 | #include <asm/psr.h> | 10 | #include <asm/psr.h> |
11 | #include <asm/asi.h> | 11 | #include <asm/asi.h> |
12 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index f58712d26bf5..3cbd6de18dde 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <linux/config.h> | 9 | #include <linux/config.h> |
10 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
11 | #include <asm/psr.h> | 11 | #include <asm/psr.h> |
12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
13 | #include <asm/asi.h> | 13 | #include <asm/asi.h> |
14 | #include <asm/mxcc.h> | 14 | #include <asm/mxcc.h> |
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |