diff options
171 files changed, 247 insertions, 386 deletions
diff --git a/Kbuild b/Kbuild new file mode 100644 index 000000000000..1880e6f760aa --- /dev/null +++ b/Kbuild | |||
@@ -0,0 +1,48 @@ | |||
1 | # | ||
2 | # Kbuild for top-level directory of the kernel | ||
3 | # This file takes care of the following: | ||
4 | # 1) Generate asm-offsets.h | ||
5 | |||
6 | ##### | ||
7 | # 1) Generate asm-offsets.h | ||
8 | # | ||
9 | |||
10 | offsets-file := include/asm-$(ARCH)/asm-offsets.h | ||
11 | |||
12 | always := $(offsets-file) | ||
13 | targets := $(offsets-file) | ||
14 | targets += arch/$(ARCH)/kernel/asm-offsets.s | ||
15 | |||
16 | # Default sed regexp - multiline due to syntax constraints | ||
17 | define sed-y | ||
18 | "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" | ||
19 | endef | ||
20 | # Override default regexp for specific architectures | ||
21 | sed-$(CONFIG_MIPS) := "/^@@@/s///p" | ||
22 | |||
23 | quiet_cmd_offsets = GEN $@ | ||
24 | define cmd_offsets | ||
25 | cat $< | \ | ||
26 | (set -e; \ | ||
27 | echo "#ifndef __ASM_OFFSETS_H__"; \ | ||
28 | echo "#define __ASM_OFFSETS_H__"; \ | ||
29 | echo "/*"; \ | ||
30 | echo " * DO NOT MODIFY."; \ | ||
31 | echo " *"; \ | ||
32 | echo " * This file was generated by $(srctree)/Kbuild"; \ | ||
33 | echo " *"; \ | ||
34 | echo " */"; \ | ||
35 | echo ""; \ | ||
36 | sed -ne $(sed-y); \ | ||
37 | echo ""; \ | ||
38 | echo "#endif" ) > $@ | ||
39 | endef | ||
40 | |||
41 | # We use internal kbuild rules to avoid the "is up to date" message from make | ||
42 | arch/$(ARCH)/kernel/asm-offsets.s: arch/$(ARCH)/kernel/asm-offsets.c FORCE | ||
43 | $(Q)mkdir -p $(dir $@) | ||
44 | $(call if_changed_dep,cc_s_c) | ||
45 | |||
46 | $(srctree)/$(offsets-file): arch/$(ARCH)/kernel/asm-offsets.s Kbuild | ||
47 | $(call cmd,offsets) | ||
48 | |||
@@ -776,14 +776,14 @@ $(vmlinux-dirs): prepare-all scripts | |||
776 | # A multi level approach is used. prepare1 is updated first, then prepare0. | 776 | # A multi level approach is used. prepare1 is updated first, then prepare0. |
777 | # prepare-all is the collection point for the prepare targets. | 777 | # prepare-all is the collection point for the prepare targets. |
778 | 778 | ||
779 | .PHONY: prepare-all prepare prepare0 prepare1 prepare2 | 779 | .PHONY: prepare-all prepare prepare0 prepare1 prepare2 prepare3 |
780 | 780 | ||
781 | # prepare2 is used to check if we are building in a separate output directory, | 781 | # prepare3 is used to check if we are building in a separate output directory, |
782 | # and if so do: | 782 | # and if so do: |
783 | # 1) Check that make has not been executed in the kernel src $(srctree) | 783 | # 1) Check that make has not been executed in the kernel src $(srctree) |
784 | # 2) Create the include2 directory, used for the second asm symlink | 784 | # 2) Create the include2 directory, used for the second asm symlink |
785 | 785 | ||
786 | prepare2: | 786 | prepare3: |
787 | ifneq ($(KBUILD_SRC),) | 787 | ifneq ($(KBUILD_SRC),) |
788 | @echo ' Using $(srctree) as source for kernel' | 788 | @echo ' Using $(srctree) as source for kernel' |
789 | $(Q)if [ -f $(srctree)/.config ]; then \ | 789 | $(Q)if [ -f $(srctree)/.config ]; then \ |
@@ -795,18 +795,21 @@ ifneq ($(KBUILD_SRC),) | |||
795 | $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm | 795 | $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm |
796 | endif | 796 | endif |
797 | 797 | ||
798 | # prepare1 creates a makefile if using a separate output directory | 798 | # prepare2 creates a makefile if using a separate output directory |
799 | prepare1: prepare2 outputmakefile | 799 | prepare2: prepare3 outputmakefile |
800 | 800 | ||
801 | prepare0: prepare1 include/linux/version.h include/asm \ | 801 | prepare1: prepare2 include/linux/version.h include/asm \ |
802 | include/config/MARKER | 802 | include/config/MARKER |
803 | ifneq ($(KBUILD_MODULES),) | 803 | ifneq ($(KBUILD_MODULES),) |
804 | $(Q)rm -rf $(MODVERDIR) | 804 | $(Q)rm -rf $(MODVERDIR) |
805 | $(Q)mkdir -p $(MODVERDIR) | 805 | $(Q)mkdir -p $(MODVERDIR) |
806 | endif | 806 | endif |
807 | 807 | ||
808 | prepare0: prepare prepare1 FORCE | ||
809 | $(Q)$(MAKE) $(build)=$(srctree) | ||
810 | |||
808 | # All the preparing.. | 811 | # All the preparing.. |
809 | prepare-all: prepare0 prepare | 812 | prepare-all: prepare0 |
810 | 813 | ||
811 | # Leave this as default for preprocessing vmlinux.lds.S, which is now | 814 | # Leave this as default for preprocessing vmlinux.lds.S, which is now |
812 | # done in arch/$(ARCH)/kernel/Makefile | 815 | # done in arch/$(ARCH)/kernel/Makefile |
@@ -949,26 +952,6 @@ modules modules_install: FORCE | |||
949 | 952 | ||
950 | endif # CONFIG_MODULES | 953 | endif # CONFIG_MODULES |
951 | 954 | ||
952 | # Generate asm-offsets.h | ||
953 | # --------------------------------------------------------------------------- | ||
954 | |||
955 | define filechk_gen-asm-offsets | ||
956 | (set -e; \ | ||
957 | echo "#ifndef __ASM_OFFSETS_H__"; \ | ||
958 | echo "#define __ASM_OFFSETS_H__"; \ | ||
959 | echo "/*"; \ | ||
960 | echo " * DO NOT MODIFY."; \ | ||
961 | echo " *"; \ | ||
962 | echo " * This file was generated by arch/$(ARCH)/Makefile"; \ | ||
963 | echo " *"; \ | ||
964 | echo " */"; \ | ||
965 | echo ""; \ | ||
966 | sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \ | ||
967 | echo ""; \ | ||
968 | echo "#endif" ) | ||
969 | endef | ||
970 | |||
971 | |||
972 | ### | 955 | ### |
973 | # Cleaning is done on three levels. | 956 | # Cleaning is done on three levels. |
974 | # make clean Delete most generated files | 957 | # make clean Delete most generated files |
@@ -991,7 +974,7 @@ MRPROPER_FILES += .config .config.old include/asm .version \ | |||
991 | # | 974 | # |
992 | clean: rm-dirs := $(CLEAN_DIRS) | 975 | clean: rm-dirs := $(CLEAN_DIRS) |
993 | clean: rm-files := $(CLEAN_FILES) | 976 | clean: rm-files := $(CLEAN_FILES) |
994 | clean-dirs := $(addprefix _clean_,$(vmlinux-alldirs)) | 977 | clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs)) |
995 | 978 | ||
996 | .PHONY: $(clean-dirs) clean archclean | 979 | .PHONY: $(clean-dirs) clean archclean |
997 | $(clean-dirs): | 980 | $(clean-dirs): |
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index 22ebfb2be0e4..1b704ee54bf3 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile | |||
@@ -108,20 +108,9 @@ $(boot)/vmlinux.gz: vmlinux | |||
108 | bootimage bootpfile bootpzfile: vmlinux | 108 | bootimage bootpfile bootpzfile: vmlinux |
109 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 109 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
110 | 110 | ||
111 | |||
112 | prepare: include/asm-$(ARCH)/asm_offsets.h | ||
113 | |||
114 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
115 | include/config/MARKER | ||
116 | |||
117 | include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
118 | $(call filechk,gen-asm-offsets) | ||
119 | |||
120 | archclean: | 111 | archclean: |
121 | $(Q)$(MAKE) $(clean)=$(boot) | 112 | $(Q)$(MAKE) $(clean)=$(boot) |
122 | 113 | ||
123 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h | ||
124 | |||
125 | define archhelp | 114 | define archhelp |
126 | echo '* boot - Compressed kernel image (arch/alpha/boot/vmlinux.gz)' | 115 | echo '* boot - Compressed kernel image (arch/alpha/boot/vmlinux.gz)' |
127 | echo ' bootimage - SRM bootable image (arch/alpha/boot/bootimage)' | 116 | echo ' bootimage - SRM bootable image (arch/alpha/boot/bootimage)' |
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index f0927ee53f29..76cc0cb5fc2e 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
8 | #include <asm/asm_offsets.h> | 8 | #include <asm/asm-offsets.h> |
9 | #include <asm/thread_info.h> | 9 | #include <asm/thread_info.h> |
10 | #include <asm/pal.h> | 10 | #include <asm/pal.h> |
11 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 4ca2e404708a..0905721fcbca 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #include <linux/config.h> | 10 | #include <linux/config.h> |
11 | #include <asm/system.h> | 11 | #include <asm/system.h> |
12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
13 | 13 | ||
14 | .globl swapper_pg_dir | 14 | .globl swapper_pg_dir |
15 | .globl _stext | 15 | .globl _stext |
diff --git a/arch/alpha/lib/dbg_stackcheck.S b/arch/alpha/lib/dbg_stackcheck.S index cc5ce3a5fcad..3c1f3e6522e5 100644 --- a/arch/alpha/lib/dbg_stackcheck.S +++ b/arch/alpha/lib/dbg_stackcheck.S | |||
@@ -5,7 +5,7 @@ | |||
5 | * Verify that we have not overflowed the stack. Oops if we have. | 5 | * Verify that we have not overflowed the stack. Oops if we have. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <asm/asm_offsets.h> | 8 | #include <asm/asm-offsets.h> |
9 | 9 | ||
10 | .text | 10 | .text |
11 | .set noat | 11 | .set noat |
diff --git a/arch/alpha/lib/dbg_stackkill.S b/arch/alpha/lib/dbg_stackkill.S index e09f2ae1e09e..e9f6a9dcf2b7 100644 --- a/arch/alpha/lib/dbg_stackkill.S +++ b/arch/alpha/lib/dbg_stackkill.S | |||
@@ -6,7 +6,7 @@ | |||
6 | * uninitialized local variables in the act. | 6 | * uninitialized local variables in the act. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <asm/asm_offsets.h> | 9 | #include <asm/asm-offsets.h> |
10 | 10 | ||
11 | .text | 11 | .text |
12 | .set noat | 12 | .set noat |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 67f1453ade05..e625ac66f49b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -178,7 +178,7 @@ endif | |||
178 | prepare: maketools include/asm-arm/.arch | 178 | prepare: maketools include/asm-arm/.arch |
179 | 179 | ||
180 | .PHONY: maketools FORCE | 180 | .PHONY: maketools FORCE |
181 | maketools: include/asm-arm/constants.h include/linux/version.h FORCE | 181 | maketools: include/linux/version.h FORCE |
182 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h | 182 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h |
183 | 183 | ||
184 | # Convert bzImage to zImage | 184 | # Convert bzImage to zImage |
@@ -190,7 +190,7 @@ zImage Image xipImage bootpImage uImage: vmlinux | |||
190 | zinstall install: vmlinux | 190 | zinstall install: vmlinux |
191 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ | 191 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ |
192 | 192 | ||
193 | CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \ | 193 | CLEAN_FILES += include/asm-arm/mach-types.h \ |
194 | include/asm-arm/arch include/asm-arm/.arch | 194 | include/asm-arm/arch include/asm-arm/.arch |
195 | 195 | ||
196 | # We use MRPROPER_FILES and CLEAN_FILES now | 196 | # We use MRPROPER_FILES and CLEAN_FILES now |
@@ -201,11 +201,6 @@ archclean: | |||
201 | bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage | 201 | bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage |
202 | i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ | 202 | i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ |
203 | 203 | ||
204 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
205 | include/asm-arm/.arch | ||
206 | |||
207 | include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
208 | $(call filechk,gen-asm-offsets) | ||
209 | 204 | ||
210 | define archhelp | 205 | define archhelp |
211 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' | 206 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' |
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index afef21273963..648cfff93138 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S | |||
@@ -3,7 +3,7 @@ | |||
3 | #include <linux/linkage.h> | 3 | #include <linux/linkage.h> |
4 | 4 | ||
5 | #include <asm/assembler.h> | 5 | #include <asm/assembler.h> |
6 | #include <asm/constants.h> | 6 | #include <asm/asm-offsets.h> |
7 | #include <asm/errno.h> | 7 | #include <asm/errno.h> |
8 | #include <asm/thread_info.h> | 8 | #include <asm/thread_info.h> |
9 | 9 | ||
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 1155cf07c871..539626351348 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | #include <asm/procinfo.h> | 21 | #include <asm/procinfo.h> |
22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
23 | #include <asm/constants.h> | 23 | #include <asm/asm-offsets.h> |
24 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
26 | 26 | ||
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index 8f74e24536ba..24c7b0477a09 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
18 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/constants.h> | 20 | #include <asm/asm-offsets.h> |
21 | 21 | ||
22 | #define MMX_WR0 (0x00) | 22 | #define MMX_WR0 (0x00) |
23 | #define MMX_WR1 (0x08) | 23 | #define MMX_WR1 (0x08) |
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S index 4c38abdbe497..68117968482b 100644 --- a/arch/arm/lib/copy_page.S +++ b/arch/arm/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/constants.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | #define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) | 16 | #define COPY_COUNT (PAGE_SZ/64 PLD( -1 )) |
17 | 17 | ||
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 46a2dc962e9d..333bca292de9 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
15 | #include <asm/errno.h> | 15 | #include <asm/errno.h> |
16 | #include <asm/constants.h> | 16 | #include <asm/asm-offsets.h> |
17 | 17 | ||
18 | .text | 18 | .text |
19 | 19 | ||
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 64aa6f4fe5e4..d204018070a4 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/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/constants.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/arm/lib/putuser.S b/arch/arm/lib/putuser.S index b09398d95aac..4593e9c07f05 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/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/constants.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/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" |
diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S index 0ed38b0913db..51940a96d6a6 100644 --- a/arch/arm/nwfpe/entry26.S +++ b/arch/arm/nwfpe/entry26.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/constants.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/arm/vfp/entry.S b/arch/arm/vfp/entry.S index e73c8deca592..6f17187ab32a 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include <linux/linkage.h> | 18 | #include <linux/linkage.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <asm/constants.h> | 20 | #include <asm/asm-offsets.h> |
21 | #include <asm/vfpmacros.h> | 21 | #include <asm/vfpmacros.h> |
22 | 22 | ||
23 | .globl do_vfp | 23 | .globl do_vfp |
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/cris/Makefile b/arch/cris/Makefile index 90ca8730b120..a00043a91f16 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile | |||
@@ -107,8 +107,7 @@ archclean: | |||
107 | rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img | 107 | rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img |
108 | rm -rf $(LD_SCRIPT).tmp | 108 | rm -rf $(LD_SCRIPT).tmp |
109 | 109 | ||
110 | prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch \ | 110 | prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch |
111 | include/asm-$(ARCH)/$(SARCH)/offset.h | ||
112 | 111 | ||
113 | # Create some links to make all tools happy | 112 | # Create some links to make all tools happy |
114 | $(SRC_ARCH)/.links: | 113 | $(SRC_ARCH)/.links: |
@@ -120,6 +119,7 @@ $(SRC_ARCH)/.links: | |||
120 | @ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib | 119 | @ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib |
121 | @ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch | 120 | @ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch |
122 | @ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S | 121 | @ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S |
122 | @ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c | ||
123 | @touch $@ | 123 | @touch $@ |
124 | 124 | ||
125 | # Create link to sub arch includes | 125 | # Create link to sub arch includes |
@@ -128,9 +128,3 @@ $(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h) | |||
128 | @rm -f include/asm-$(ARCH)/arch | 128 | @rm -f include/asm-$(ARCH)/arch |
129 | @ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch | 129 | @ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch |
130 | @touch $@ | 130 | @touch $@ |
131 | |||
132 | arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
133 | include/config/MARKER | ||
134 | |||
135 | include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s | ||
136 | $(call filechk,gen-asm-offsets) | ||
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index c0163bf94a50..c808005e8457 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
@@ -270,7 +270,7 @@ | |||
270 | #include <asm/arch/sv_addr_ag.h> | 270 | #include <asm/arch/sv_addr_ag.h> |
271 | #include <asm/errno.h> | 271 | #include <asm/errno.h> |
272 | #include <asm/thread_info.h> | 272 | #include <asm/thread_info.h> |
273 | #include <asm/arch/offset.h> | 273 | #include <asm/asm-offsets.h> |
274 | #include <asm/page.h> | 274 | #include <asm/page.h> |
275 | #include <asm/pgtable.h> | 275 | #include <asm/pgtable.h> |
276 | 276 | ||
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index a8ed55e5b403..3bd8503fec68 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/unistd.h> | 23 | #include <asm/unistd.h> |
24 | #include <asm/errno.h> | 24 | #include <asm/errno.h> |
25 | #include <asm/thread_info.h> | 25 | #include <asm/thread_info.h> |
26 | #include <asm/arch/offset.h> | 26 | #include <asm/asm-offsets.h> |
27 | 27 | ||
28 | #include <asm/arch/hwregs/asm/reg_map_asm.h> | 28 | #include <asm/arch/hwregs/asm/reg_map_asm.h> |
29 | #include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> | 29 | #include <asm/arch/hwregs/asm/intr_vect_defs_asm.h> |
diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c new file mode 100644 index 000000000000..9e263112a6e2 --- /dev/null +++ b/arch/frv/kernel/asm-offsets.c | |||
@@ -0,0 +1 @@ | |||
/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */ | |||
diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile index c9b80cffd71d..40b3f56f3666 100644 --- a/arch/h8300/Makefile +++ b/arch/h8300/Makefile | |||
@@ -61,12 +61,6 @@ archmrproper: | |||
61 | archclean: | 61 | archclean: |
62 | $(Q)$(MAKE) $(clean)=$(boot) | 62 | $(Q)$(MAKE) $(clean)=$(boot) |
63 | 63 | ||
64 | prepare: include/asm-$(ARCH)/asm-offsets.h | ||
65 | |||
66 | include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ | ||
67 | include/asm include/linux/version.h | ||
68 | $(call filechk,gen-asm-offsets) | ||
69 | |||
70 | vmlinux.srec vmlinux.bin: vmlinux | 64 | vmlinux.srec vmlinux.bin: vmlinux |
71 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 65 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
72 | 66 | ||
@@ -74,5 +68,3 @@ define archhelp | |||
74 | echo 'vmlinux.bin - Create raw binary' | 68 | echo 'vmlinux.bin - Create raw binary' |
75 | echo 'vmlinux.srec - Create srec binary' | 69 | echo 'vmlinux.srec - Create srec binary' |
76 | endef | 70 | endef |
77 | |||
78 | CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h | ||
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index bf7c9ba709f3..09951990a622 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
@@ -156,15 +156,6 @@ install: vmlinux | |||
156 | install kernel_install: | 156 | install kernel_install: |
157 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install | 157 | $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install |
158 | 158 | ||
159 | prepare: include/asm-$(ARCH)/asm_offsets.h | ||
160 | CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h | ||
161 | |||
162 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
163 | include/config/MARKER | ||
164 | |||
165 | include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
166 | $(call filechk,gen-asm-offsets) | ||
167 | |||
168 | archclean: | 159 | archclean: |
169 | $(Q)$(MAKE) $(clean)=arch/i386/boot | 160 | $(Q)$(MAKE) $(clean)=arch/i386/boot |
170 | 161 | ||
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 0480ca9e9e57..e437fb367498 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/desc.h> | 17 | #include <asm/desc.h> |
18 | #include <asm/cache.h> | 18 | #include <asm/cache.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/asm_offsets.h> | 20 | #include <asm/asm-offsets.h> |
21 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
22 | 22 | ||
23 | /* | 23 | /* |
diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S index 68afa50dd7cf..fadb5bc3c374 100644 --- a/arch/i386/kernel/vsyscall-sigreturn.S +++ b/arch/i386/kernel/vsyscall-sigreturn.S | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <asm/unistd.h> | 9 | #include <asm/unistd.h> |
10 | #include <asm/asm_offsets.h> | 10 | #include <asm/asm-offsets.h> |
11 | 11 | ||
12 | 12 | ||
13 | /* XXX | 13 | /* XXX |
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S index a7977707c8e5..98699ca6e52d 100644 --- a/arch/i386/kernel/vsyscall.lds.S +++ b/arch/i386/kernel/vsyscall.lds.S | |||
@@ -3,7 +3,7 @@ | |||
3 | * object prelinked to its virtual address, and with only one read-only | 3 | * object prelinked to its virtual address, and with only one read-only |
4 | * segment (that fits in one page). This script controls its layout. | 4 | * segment (that fits in one page). This script controls its layout. |
5 | */ | 5 | */ |
6 | #include <asm/asm_offsets.h> | 6 | #include <asm/asm-offsets.h> |
7 | 7 | ||
8 | SECTIONS | 8 | SECTIONS |
9 | { | 9 | { |
diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S index c4105286ff26..c893b897217f 100644 --- a/arch/i386/power/swsusp.S +++ b/arch/i386/power/swsusp.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/segment.h> | 13 | #include <asm/segment.h> |
14 | #include <asm/page.h> | 14 | #include <asm/page.h> |
15 | #include <asm/asm_offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | 16 | ||
17 | .text | 17 | .text |
18 | 18 | ||
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index f9bd88ada708..7ed678cf5e41 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
@@ -82,25 +82,18 @@ unwcheck: vmlinux | |||
82 | archclean: | 82 | archclean: |
83 | $(Q)$(MAKE) $(clean)=$(boot) | 83 | $(Q)$(MAKE) $(clean)=$(boot) |
84 | 84 | ||
85 | CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader | 85 | prepare: include/asm-ia64/.offsets.h.stamp |
86 | |||
87 | MRPROPER_FILES += include/asm-ia64/offsets.h | ||
88 | |||
89 | prepare: include/asm-ia64/offsets.h | ||
90 | |||
91 | arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER | ||
92 | |||
93 | include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s | ||
94 | $(call filechk,gen-asm-offsets) | ||
95 | |||
96 | arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp | ||
97 | 86 | ||
98 | include/asm-ia64/.offsets.h.stamp: | 87 | include/asm-ia64/.offsets.h.stamp: |
99 | mkdir -p include/asm-ia64 | 88 | mkdir -p include/asm-ia64 |
100 | [ -s include/asm-ia64/offsets.h ] \ | 89 | [ -s include/asm-ia64/asm-offsets.h ] \ |
101 | || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h | 90 | || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h |
102 | touch $@ | 91 | touch $@ |
103 | 92 | ||
93 | |||
94 | |||
95 | CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp | ||
96 | |||
104 | boot: lib/lib.a vmlinux | 97 | boot: lib/lib.a vmlinux |
105 | $(Q)$(MAKE) $(build)=$(boot) $@ | 98 | $(Q)$(MAKE) $(build)=$(boot) $@ |
106 | 99 | ||
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 0708edb06cc4..494fad6bf376 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
@@ -1,6 +1,6 @@ | |||
1 | #include <asm/asmmacro.h> | 1 | #include <asm/asmmacro.h> |
2 | #include <asm/ia32.h> | 2 | #include <asm/ia32.h> |
3 | #include <asm/offsets.h> | 3 | #include <asm/asm-offsets.h> |
4 | #include <asm/signal.h> | 4 | #include <asm/signal.h> |
5 | #include <asm/thread_info.h> | 5 | #include <asm/thread_info.h> |
6 | 6 | ||
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 915e12791836..ba0b6a1f429f 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <asm/cache.h> | 37 | #include <asm/cache.h> |
38 | #include <asm/errno.h> | 38 | #include <asm/errno.h> |
39 | #include <asm/kregs.h> | 39 | #include <asm/kregs.h> |
40 | #include <asm/offsets.h> | 40 | #include <asm/asm-offsets.h> |
41 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
42 | #include <asm/percpu.h> | 42 | #include <asm/percpu.h> |
43 | #include <asm/processor.h> | 43 | #include <asm/processor.h> |
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index 7d7684a369d3..2ddbac6f4999 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <asm/asmmacro.h> | 15 | #include <asm/asmmacro.h> |
16 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
17 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/percpu.h> | 18 | #include <asm/percpu.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/sal.h> | 20 | #include <asm/sal.h> |
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S index 86948ce63e43..86064ca98952 100644 --- a/arch/ia64/kernel/gate.S +++ b/arch/ia64/kernel/gate.S | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | #include <asm/asmmacro.h> | 11 | #include <asm/asmmacro.h> |
12 | #include <asm/errno.h> | 12 | #include <asm/errno.h> |
13 | #include <asm/offsets.h> | 13 | #include <asm/asm-offsets.h> |
14 | #include <asm/sigcontext.h> | 14 | #include <asm/sigcontext.h> |
15 | #include <asm/system.h> | 15 | #include <asm/system.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index 8d3a9291b47f..bfe65b2e8621 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/fpu.h> | 25 | #include <asm/fpu.h> |
26 | #include <asm/kregs.h> | 26 | #include <asm/kregs.h> |
27 | #include <asm/mmu_context.h> | 27 | #include <asm/mmu_context.h> |
28 | #include <asm/offsets.h> | 28 | #include <asm/asm-offsets.h> |
29 | #include <asm/pal.h> | 29 | #include <asm/pal.h> |
30 | #include <asm/pgtable.h> | 30 | #include <asm/pgtable.h> |
31 | #include <asm/processor.h> | 31 | #include <asm/processor.h> |
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 3bb3a13c4047..3ba8384cb43d 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <asm/break.h> | 44 | #include <asm/break.h> |
45 | #include <asm/ia32.h> | 45 | #include <asm/ia32.h> |
46 | #include <asm/kregs.h> | 46 | #include <asm/kregs.h> |
47 | #include <asm/offsets.h> | 47 | #include <asm/asm-offsets.h> |
48 | #include <asm/pgtable.h> | 48 | #include <asm/pgtable.h> |
49 | #include <asm/processor.h> | 49 | #include <asm/processor.h> |
50 | #include <asm/ptrace.h> | 50 | #include <asm/ptrace.h> |
diff --git a/arch/m32r/kernel/asm-offsets.c b/arch/m32r/kernel/asm-offsets.c new file mode 100644 index 000000000000..9e263112a6e2 --- /dev/null +++ b/arch/m32r/kernel/asm-offsets.c | |||
@@ -0,0 +1 @@ | |||
/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */ | |||
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 466e7407afc7..34d826d10f1b 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
@@ -113,14 +113,5 @@ else | |||
113 | bzip2 -1c vmlinux >vmlinux.bz2 | 113 | bzip2 -1c vmlinux >vmlinux.bz2 |
114 | endif | 114 | endif |
115 | 115 | ||
116 | prepare: include/asm-$(ARCH)/offsets.h | ||
117 | CLEAN_FILES += include/asm-$(ARCH)/offsets.h | ||
118 | |||
119 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
120 | include/config/MARKER | ||
121 | |||
122 | include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
123 | $(call filechk,gen-asm-offsets) | ||
124 | |||
125 | archclean: | 116 | archclean: |
126 | rm -f vmlinux.gz vmlinux.bz2 | 117 | rm -f vmlinux.gz vmlinux.bz2 |
diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S index dbc1255a5e99..9571a21d6ad4 100644 --- a/arch/m68k/fpsp040/skeleton.S +++ b/arch/m68k/fpsp040/skeleton.S | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include <linux/linkage.h> | 41 | #include <linux/linkage.h> |
42 | #include <asm/entry.h> | 42 | #include <asm/entry.h> |
43 | #include <asm/offsets.h> | 43 | #include <asm/asm-offsets.h> |
44 | 44 | ||
45 | |SKELETON idnt 2,1 | Motorola 040 Floating Point Software Package | 45 | |SKELETON idnt 2,1 | Motorola 040 Floating Point Software Package |
46 | 46 | ||
diff --git a/arch/m68k/ifpsp060/iskeleton.S b/arch/m68k/ifpsp060/iskeleton.S index 803a6ecdda81..4ba2c74da93d 100644 --- a/arch/m68k/ifpsp060/iskeleton.S +++ b/arch/m68k/ifpsp060/iskeleton.S | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
38 | #include <asm/entry.h> | 38 | #include <asm/entry.h> |
39 | #include <asm/offsets.h> | 39 | #include <asm/asm-offsets.h> |
40 | 40 | ||
41 | 41 | ||
42 | |################################ | 42 | |################################ |
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index e964015a31dc..23ca60a45552 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <asm/traps.h> | 42 | #include <asm/traps.h> |
43 | #include <asm/unistd.h> | 43 | #include <asm/unistd.h> |
44 | 44 | ||
45 | #include <asm/offsets.h> | 45 | #include <asm/asm-offsets.h> |
46 | 46 | ||
47 | .globl system_call, buserr, trap | 47 | .globl system_call, buserr, trap |
48 | .globl resume, ret_from_exception | 48 | .globl resume, ret_from_exception |
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index 7cd6de17c20d..d4336d846df1 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S | |||
@@ -263,7 +263,7 @@ | |||
263 | #include <asm/entry.h> | 263 | #include <asm/entry.h> |
264 | #include <asm/pgtable.h> | 264 | #include <asm/pgtable.h> |
265 | #include <asm/page.h> | 265 | #include <asm/page.h> |
266 | #include <asm/offsets.h> | 266 | #include <asm/asm-offsets.h> |
267 | 267 | ||
268 | #ifdef CONFIG_MAC | 268 | #ifdef CONFIG_MAC |
269 | 269 | ||
diff --git a/arch/m68k/math-emu/fp_emu.h b/arch/m68k/math-emu/fp_emu.h index 1d6edc975d89..c1ecfef7886a 100644 --- a/arch/m68k/math-emu/fp_emu.h +++ b/arch/m68k/math-emu/fp_emu.h | |||
@@ -39,7 +39,7 @@ | |||
39 | #define _FP_EMU_H | 39 | #define _FP_EMU_H |
40 | 40 | ||
41 | #ifdef __ASSEMBLY__ | 41 | #ifdef __ASSEMBLY__ |
42 | #include <asm/offsets.h> | 42 | #include <asm/asm-offsets.h> |
43 | #endif | 43 | #endif |
44 | #include <asm/math-emu.h> | 44 | #include <asm/math-emu.h> |
45 | 45 | ||
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile index 7ce5e55b2401..b8fdf191b8f6 100644 --- a/arch/m68knommu/Makefile +++ b/arch/m68knommu/Makefile | |||
@@ -102,21 +102,11 @@ CFLAGS += -DUTS_SYSNAME=\"uClinux\" | |||
102 | 102 | ||
103 | head-y := arch/m68knommu/platform/$(cpuclass-y)/head.o | 103 | head-y := arch/m68knommu/platform/$(cpuclass-y)/head.o |
104 | 104 | ||
105 | CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \ | ||
106 | arch/$(ARCH)/kernel/asm-offsets.s | ||
107 | |||
108 | core-y += arch/m68knommu/kernel/ \ | 105 | core-y += arch/m68knommu/kernel/ \ |
109 | arch/m68knommu/mm/ \ | 106 | arch/m68knommu/mm/ \ |
110 | $(CLASSDIR) \ | 107 | $(CLASSDIR) \ |
111 | arch/m68knommu/platform/$(PLATFORM)/ | 108 | arch/m68knommu/platform/$(PLATFORM)/ |
112 | libs-y += arch/m68knommu/lib/ | 109 | libs-y += arch/m68knommu/lib/ |
113 | 110 | ||
114 | prepare: include/asm-$(ARCH)/asm-offsets.h | ||
115 | |||
116 | archclean: | 111 | archclean: |
117 | $(Q)$(MAKE) $(clean)=arch/m68knommu/boot | 112 | $(Q)$(MAKE) $(clean)=arch/m68knommu/boot |
118 | |||
119 | include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ | ||
120 | include/asm include/linux/version.h \ | ||
121 | include/config/MARKER | ||
122 | $(call filechk,gen-asm-offsets) | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index b0fdaee8d8d9..346e803f153b 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -720,38 +720,7 @@ archclean: | |||
720 | @$(MAKE) $(clean)=arch/mips/boot | 720 | @$(MAKE) $(clean)=arch/mips/boot |
721 | @$(MAKE) $(clean)=arch/mips/lasat | 721 | @$(MAKE) $(clean)=arch/mips/lasat |
722 | 722 | ||
723 | # Generate <asm/offset.h | 723 | |
724 | # | 724 | CLEAN_FILES += vmlinux.32 \ |
725 | # The default rule is suffering from funny problems on MIPS so we using our | ||
726 | # own ... | ||
727 | # | ||
728 | # --------------------------------------------------------------------------- | ||
729 | |||
730 | define filechk_gen-asm-offset.h | ||
731 | (set -e; \ | ||
732 | echo "#ifndef _ASM_OFFSET_H"; \ | ||
733 | echo "#define _ASM_OFFSET_H"; \ | ||
734 | echo "/*"; \ | ||
735 | echo " * DO NOT MODIFY."; \ | ||
736 | echo " *"; \ | ||
737 | echo " * This file was generated by arch/$(ARCH)/Makefile"; \ | ||
738 | echo " *"; \ | ||
739 | echo " */"; \ | ||
740 | echo ""; \ | ||
741 | sed -ne "/^@@@/s///p"; \ | ||
742 | echo "#endif /* _ASM_OFFSET_H */" ) | ||
743 | endef | ||
744 | |||
745 | prepare: include/asm-$(ARCH)/offset.h | ||
746 | |||
747 | arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \ | ||
748 | include/config/MARKER | ||
749 | |||
750 | include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s | ||
751 | $(call filechk,gen-asm-offset.h) | ||
752 | |||
753 | CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \ | ||
754 | include/asm-$(ARCH)/offset.h \ | ||
755 | vmlinux.32 \ | ||
756 | vmlinux.64 \ | 725 | vmlinux.64 \ |
757 | vmlinux.ecoff | 726 | vmlinux.ecoff |
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S index f83c31f720c4..ac68e68339db 100644 --- a/arch/mips/kernel/r2300_fpu.S +++ b/arch/mips/kernel/r2300_fpu.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/errno.h> | 15 | #include <asm/errno.h> |
16 | #include <asm/fpregdef.h> | 16 | #include <asm/fpregdef.h> |
17 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
18 | #include <asm/offset.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/regdef.h> | 19 | #include <asm/regdef.h> |
20 | 20 | ||
21 | #define EX(a,b) \ | 21 | #define EX(a,b) \ |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index f10019640ee9..0d9c4a32a9c2 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/cachectl.h> | 15 | #include <asm/cachectl.h> |
16 | #include <asm/fpregdef.h> | 16 | #include <asm/fpregdef.h> |
17 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
18 | #include <asm/offset.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
20 | #include <asm/regdef.h> | 20 | #include <asm/regdef.h> |
21 | #include <asm/stackframe.h> | 21 | #include <asm/stackframe.h> |
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index aba665bcb386..1a14c6b18829 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/errno.h> | 17 | #include <asm/errno.h> |
18 | #include <asm/fpregdef.h> | 18 | #include <asm/fpregdef.h> |
19 | #include <asm/mipsregs.h> | 19 | #include <asm/mipsregs.h> |
20 | #include <asm/offset.h> | 20 | #include <asm/asm-offsets.h> |
21 | #include <asm/regdef.h> | 21 | #include <asm/regdef.h> |
22 | 22 | ||
23 | .macro EX insn, reg, src | 23 | .macro EX insn, reg, src |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index e02b7722ccb8..d2afbd19a9c8 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/cachectl.h> | 15 | #include <asm/cachectl.h> |
16 | #include <asm/fpregdef.h> | 16 | #include <asm/fpregdef.h> |
17 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
18 | #include <asm/offset.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
20 | #include <asm/pgtable-bits.h> | 20 | #include <asm/pgtable-bits.h> |
21 | #include <asm/regdef.h> | 21 | #include <asm/regdef.h> |
diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S index d8d3b13fe57f..43cda53f5af6 100644 --- a/arch/mips/kernel/r6000_fpu.S +++ b/arch/mips/kernel/r6000_fpu.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
14 | #include <asm/fpregdef.h> | 14 | #include <asm/fpregdef.h> |
15 | #include <asm/mipsregs.h> | 15 | #include <asm/mipsregs.h> |
16 | #include <asm/offset.h> | 16 | #include <asm/asm-offsets.h> |
17 | #include <asm/regdef.h> | 17 | #include <asm/regdef.h> |
18 | 18 | ||
19 | .set noreorder | 19 | .set noreorder |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 344f2e29eb61..17b5030fb6ea 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/unistd.h> | 20 | #include <asm/unistd.h> |
21 | #include <asm/war.h> | 21 | #include <asm/war.h> |
22 | #include <asm/offset.h> | 22 | #include <asm/asm-offsets.h> |
23 | 23 | ||
24 | /* Highest syscall used of any syscall flavour */ | 24 | /* Highest syscall used of any syscall flavour */ |
25 | #define MAX_SYSCALL_NO __NR_O32_Linux + __NR_O32_Linux_syscalls | 25 | #define MAX_SYSCALL_NO __NR_O32_Linux + __NR_O32_Linux_syscalls |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 32efb888160a..ffb22a2068bf 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/mipsregs.h> | 14 | #include <asm/mipsregs.h> |
15 | #include <asm/regdef.h> | 15 | #include <asm/regdef.h> |
16 | #include <asm/stackframe.h> | 16 | #include <asm/stackframe.h> |
17 | #include <asm/offset.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/sysmips.h> | 18 | #include <asm/sysmips.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/unistd.h> | 20 | #include <asm/unistd.h> |
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index ae2a1312d4ef..21e3e13a4b44 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/cachectl.h> | 31 | #include <asm/cachectl.h> |
32 | #include <asm/cacheflush.h> | 32 | #include <asm/cacheflush.h> |
33 | #include <asm/ipc.h> | 33 | #include <asm/ipc.h> |
34 | #include <asm/offset.h> | 34 | #include <asm/asm-offsets.h> |
35 | #include <asm/signal.h> | 35 | #include <asm/signal.h> |
36 | #include <asm/sim.h> | 36 | #include <asm/sim.h> |
37 | #include <asm/shmparam.h> | 37 | #include <asm/shmparam.h> |
diff --git a/arch/mips/lib-32/memset.S b/arch/mips/lib-32/memset.S index ad9ff4071ce9..1981485bd48b 100644 --- a/arch/mips/lib-32/memset.S +++ b/arch/mips/lib-32/memset.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
8 | */ | 8 | */ |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | 12 | ||
13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib-64/memset.S b/arch/mips/lib-64/memset.S index 242f1976cfaf..e2c42c85113b 100644 --- a/arch/mips/lib-64/memset.S +++ b/arch/mips/lib-64/memset.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 7 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
8 | */ | 8 | */ |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | 12 | ||
13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 90ee8d43261f..a78865f76547 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
16 | #include <asm/asm.h> | 16 | #include <asm/asm.h> |
17 | #include <asm/offset.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/regdef.h> | 18 | #include <asm/regdef.h> |
19 | 19 | ||
20 | #define dst a0 | 20 | #define dst a0 |
diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S index 07660e86c99d..eca558d83a37 100644 --- a/arch/mips/lib/strlen_user.S +++ b/arch/mips/lib/strlen_user.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (c) 1999 Silicon Graphics, Inc. | 7 | * Copyright (c) 1999 Silicon Graphics, Inc. |
8 | */ | 8 | */ |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | 12 | ||
13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S index 14bed17c1648..d16c76fbfac7 100644 --- a/arch/mips/lib/strncpy_user.S +++ b/arch/mips/lib/strncpy_user.S | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | 12 | ||
13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S index 6e7a8eed4de8..c0ea15194a0e 100644 --- a/arch/mips/lib/strnlen_user.S +++ b/arch/mips/lib/strnlen_user.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (c) 1999 Silicon Graphics, Inc. | 7 | * Copyright (c) 1999 Silicon Graphics, Inc. |
8 | */ | 8 | */ |
9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | 12 | ||
13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 0403d2fcb85e..3b339b1cce13 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile | |||
@@ -100,15 +100,7 @@ kernel_install: vmlinux | |||
100 | 100 | ||
101 | install: kernel_install modules_install | 101 | install: kernel_install modules_install |
102 | 102 | ||
103 | prepare: include/asm-parisc/offsets.h | 103 | CLEAN_FILES += lifimage |
104 | |||
105 | arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
106 | include/config/MARKER | ||
107 | |||
108 | include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s | ||
109 | $(call filechk,gen-asm-offsets) | ||
110 | |||
111 | CLEAN_FILES += lifimage include/asm-parisc/offsets.h | ||
112 | MRPROPER_FILES += palo.conf | 104 | MRPROPER_FILES += palo.conf |
113 | 105 | ||
114 | define archhelp | 106 | define archhelp |
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index 2680a1c0fa77..aaaf3306c05a 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <asm/assembly.h> | 11 | #include <asm/assembly.h> |
12 | #include <asm/offsets.h> | 12 | #include <asm/asm-offsets.h> |
13 | #include <asm/unistd.h> | 13 | #include <asm/unistd.h> |
14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
15 | 15 | ||
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index 1aa936dfe147..0b0c3a66b1be 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S | |||
@@ -24,7 +24,7 @@ | |||
24 | #warning PA64 support needs more work...did first cut | 24 | #warning PA64 support needs more work...did first cut |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #include <asm/offsets.h> | 27 | #include <asm/asm-offsets.h> |
28 | #include <asm/assembly.h> | 28 | #include <asm/assembly.h> |
29 | #include <asm/signal.h> | 29 | #include <asm/signal.h> |
30 | 30 | ||
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index ee58d37dbb27..be0f07f2fa58 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/config.h> | 25 | #include <linux/config.h> |
26 | #include <asm/offsets.h> | 26 | #include <asm/asm-offsets.h> |
27 | 27 | ||
28 | /* we have the following possibilities to act on an interruption: | 28 | /* we have the following possibilities to act on an interruption: |
29 | * - handle in assembly and use shadowed registers only | 29 | * - handle in assembly and use shadowed registers only |
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index ddf7e914f15e..28405edf8448 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/autoconf.h> /* for CONFIG_SMP */ | 15 | #include <linux/autoconf.h> /* for CONFIG_SMP */ |
16 | 16 | ||
17 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/psw.h> | 18 | #include <asm/psw.h> |
19 | #include <asm/pdc.h> | 19 | #include <asm/pdc.h> |
20 | 20 | ||
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 4fc04501d5e5..46b759385115 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <linux/kallsyms.h> | 47 | #include <linux/kallsyms.h> |
48 | 48 | ||
49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
50 | #include <asm/offsets.h> | 50 | #include <asm/asm-offsets.h> |
51 | #include <asm/pdc.h> | 51 | #include <asm/pdc.h> |
52 | #include <asm/pdc_chassis.h> | 52 | #include <asm/pdc_chassis.h> |
53 | #include <asm/pgalloc.h> | 53 | #include <asm/pgalloc.h> |
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index c07db9dff7cd..f3428e5e86fb 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
24 | #include <asm/system.h> | 24 | #include <asm/system.h> |
25 | #include <asm/processor.h> | 25 | #include <asm/processor.h> |
26 | #include <asm/offsets.h> | 26 | #include <asm/asm-offsets.h> |
27 | 27 | ||
28 | /* PSW bits we allow the debugger to modify */ | 28 | /* PSW bits we allow the debugger to modify */ |
29 | #define USER_PSW_BITS (PSW_N | PSW_V | PSW_CB) | 29 | #define USER_PSW_BITS (PSW_N | PSW_V | PSW_CB) |
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 55d71c15e1f7..0224651fd8f1 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | #include <asm/pgalloc.h> | 33 | #include <asm/pgalloc.h> |
34 | #include <asm/cacheflush.h> | 34 | #include <asm/cacheflush.h> |
35 | #include <asm/offsets.h> | 35 | #include <asm/asm-offsets.h> |
36 | 36 | ||
37 | #ifdef CONFIG_COMPAT | 37 | #ifdef CONFIG_COMPAT |
38 | #include <linux/compat.h> | 38 | #include <linux/compat.h> |
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index 32ea701f4d20..8c7a7185cd3b 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
@@ -7,7 +7,7 @@ | |||
7 | * sorry about the wall, puffin.. | 7 | * sorry about the wall, puffin.. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <asm/offsets.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/errno.h> | 12 | #include <asm/errno.h> |
13 | #include <asm/psw.h> | 13 | #include <asm/psw.h> |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 134f0cd240f5..1b91612ed964 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
@@ -20,7 +20,7 @@ | |||
20 | * Fixup routines for kernel exception handling. | 20 | * Fixup routines for kernel exception handling. |
21 | */ | 21 | */ |
22 | #include <linux/config.h> | 22 | #include <linux/config.h> |
23 | #include <asm/offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | #include <asm/assembly.h> | 24 | #include <asm/assembly.h> |
25 | #include <asm/errno.h> | 25 | #include <asm/errno.h> |
26 | 26 | ||
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index d1b6e6dcb504..4b3fe395ffa4 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile | |||
@@ -105,13 +105,7 @@ archclean: | |||
105 | $(Q)$(MAKE) $(clean)=arch/ppc/boot | 105 | $(Q)$(MAKE) $(clean)=arch/ppc/boot |
106 | $(Q)rm -rf include3 | 106 | $(Q)rm -rf include3 |
107 | 107 | ||
108 | prepare: include/asm-$(ARCH)/offsets.h checkbin | 108 | prepare: checkbin |
109 | |||
110 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
111 | include/config/MARKER | ||
112 | |||
113 | include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
114 | $(call filechk,gen-asm-offsets) | ||
115 | 109 | ||
116 | # Temporary hack until we have migrated to asm-powerpc | 110 | # Temporary hack until we have migrated to asm-powerpc |
117 | include/asm: include3/asm | 111 | include/asm: include3/asm |
@@ -143,7 +137,5 @@ checkbin: | |||
143 | false ; \ | 137 | false ; \ |
144 | fi | 138 | fi |
145 | 139 | ||
146 | CLEAN_FILES += include/asm-$(ARCH)/offsets.h \ | 140 | CLEAN_FILES += $(TOUT) |
147 | arch/$(ARCH)/kernel/asm-offsets.s \ | ||
148 | $(TOUT) | ||
149 | 141 | ||
diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S index bd037caa4055..1f37b7eafac2 100644 --- a/arch/ppc/kernel/cpu_setup_6xx.S +++ b/arch/ppc/kernel/cpu_setup_6xx.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/cputable.h> | 16 | #include <asm/cputable.h> |
17 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
18 | #include <asm/offsets.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/cache.h> | 19 | #include <asm/cache.h> |
20 | 20 | ||
21 | _GLOBAL(__setup_cpu_601) | 21 | _GLOBAL(__setup_cpu_601) |
diff --git a/arch/ppc/kernel/cpu_setup_power4.S b/arch/ppc/kernel/cpu_setup_power4.S index f2ea1a990f17..304589aebdbc 100644 --- a/arch/ppc/kernel/cpu_setup_power4.S +++ b/arch/ppc/kernel/cpu_setup_power4.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/cputable.h> | 16 | #include <asm/cputable.h> |
17 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
18 | #include <asm/offsets.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/cache.h> | 19 | #include <asm/cache.h> |
20 | 20 | ||
21 | _GLOBAL(__970_cpu_preinit) | 21 | _GLOBAL(__970_cpu_preinit) |
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index cb83045e2edf..03d4886869f3 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <asm/cputable.h> | 29 | #include <asm/cputable.h> |
30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
31 | #include <asm/ppc_asm.h> | 31 | #include <asm/ppc_asm.h> |
32 | #include <asm/offsets.h> | 32 | #include <asm/asm-offsets.h> |
33 | #include <asm/unistd.h> | 33 | #include <asm/unistd.h> |
34 | 34 | ||
35 | #undef SHOW_SYSCALLS | 35 | #undef SHOW_SYSCALLS |
diff --git a/arch/ppc/kernel/fpu.S b/arch/ppc/kernel/fpu.S index 6189b26f640f..665d7d34304c 100644 --- a/arch/ppc/kernel/fpu.S +++ b/arch/ppc/kernel/fpu.S | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/cache.h> | 18 | #include <asm/cache.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/ppc_asm.h> | 20 | #include <asm/ppc_asm.h> |
21 | #include <asm/offsets.h> | 21 | #include <asm/asm-offsets.h> |
22 | 22 | ||
23 | /* | 23 | /* |
24 | * This task wants to use the FPU now. | 24 | * This task wants to use the FPU now. |
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index a931d773715f..55daf1210f32 100644 --- a/arch/ppc/kernel/head.S +++ b/arch/ppc/kernel/head.S | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/cache.h> | 31 | #include <asm/cache.h> |
32 | #include <asm/thread_info.h> | 32 | #include <asm/thread_info.h> |
33 | #include <asm/ppc_asm.h> | 33 | #include <asm/ppc_asm.h> |
34 | #include <asm/offsets.h> | 34 | #include <asm/asm-offsets.h> |
35 | 35 | ||
36 | #ifdef CONFIG_APUS | 36 | #ifdef CONFIG_APUS |
37 | #include <asm/amigappc.h> | 37 | #include <asm/amigappc.h> |
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 9e68e32edb60..599245b0407e 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/cputable.h> | 40 | #include <asm/cputable.h> |
41 | #include <asm/thread_info.h> | 41 | #include <asm/thread_info.h> |
42 | #include <asm/ppc_asm.h> | 42 | #include <asm/ppc_asm.h> |
43 | #include <asm/offsets.h> | 43 | #include <asm/asm-offsets.h> |
44 | #include "head_booke.h" | 44 | #include "head_booke.h" |
45 | 45 | ||
46 | 46 | ||
diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S index ca9518b96c6e..8562b807b37c 100644 --- a/arch/ppc/kernel/head_4xx.S +++ b/arch/ppc/kernel/head_4xx.S | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/cputable.h> | 40 | #include <asm/cputable.h> |
41 | #include <asm/thread_info.h> | 41 | #include <asm/thread_info.h> |
42 | #include <asm/ppc_asm.h> | 42 | #include <asm/ppc_asm.h> |
43 | #include <asm/offsets.h> | 43 | #include <asm/asm-offsets.h> |
44 | 44 | ||
45 | /* As with the other PowerPC ports, it is expected that when code | 45 | /* As with the other PowerPC ports, it is expected that when code |
46 | * execution begins here, the following registers contain valid, yet | 46 | * execution begins here, the following registers contain valid, yet |
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S index eb18cadb3755..cb1a3a54a026 100644 --- a/arch/ppc/kernel/head_8xx.S +++ b/arch/ppc/kernel/head_8xx.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/cputable.h> | 30 | #include <asm/cputable.h> |
31 | #include <asm/thread_info.h> | 31 | #include <asm/thread_info.h> |
32 | #include <asm/ppc_asm.h> | 32 | #include <asm/ppc_asm.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | 34 | ||
35 | /* Macro to make the code more readable. */ | 35 | /* Macro to make the code more readable. */ |
36 | #ifdef CONFIG_8xx_CPU6 | 36 | #ifdef CONFIG_8xx_CPU6 |
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S index 4028f4c7d978..8e52e8408316 100644 --- a/arch/ppc/kernel/head_fsl_booke.S +++ b/arch/ppc/kernel/head_fsl_booke.S | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <asm/cputable.h> | 41 | #include <asm/cputable.h> |
42 | #include <asm/thread_info.h> | 42 | #include <asm/thread_info.h> |
43 | #include <asm/ppc_asm.h> | 43 | #include <asm/ppc_asm.h> |
44 | #include <asm/offsets.h> | 44 | #include <asm/asm-offsets.h> |
45 | #include "head_booke.h" | 45 | #include "head_booke.h" |
46 | 46 | ||
47 | /* As with the other PowerPC ports, it is expected that when code | 47 | /* As with the other PowerPC ports, it is expected that when code |
diff --git a/arch/ppc/kernel/idle_6xx.S b/arch/ppc/kernel/idle_6xx.S index 25d009c75f7b..1a2194cf6828 100644 --- a/arch/ppc/kernel/idle_6xx.S +++ b/arch/ppc/kernel/idle_6xx.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | #include <asm/thread_info.h> | 21 | #include <asm/thread_info.h> |
22 | #include <asm/ppc_asm.h> | 22 | #include <asm/ppc_asm.h> |
23 | #include <asm/offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | 24 | ||
25 | #undef DEBUG | 25 | #undef DEBUG |
26 | 26 | ||
diff --git a/arch/ppc/kernel/idle_power4.S b/arch/ppc/kernel/idle_power4.S index 73a58ff03900..cc0d535365cd 100644 --- a/arch/ppc/kernel/idle_power4.S +++ b/arch/ppc/kernel/idle_power4.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | #include <asm/thread_info.h> | 21 | #include <asm/thread_info.h> |
22 | #include <asm/ppc_asm.h> | 22 | #include <asm/ppc_asm.h> |
23 | #include <asm/offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | 24 | ||
25 | #undef DEBUG | 25 | #undef DEBUG |
26 | 26 | ||
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index ce71b4a01585..90d917d2e856 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/mmu.h> | 23 | #include <asm/mmu.h> |
24 | #include <asm/ppc_asm.h> | 24 | #include <asm/ppc_asm.h> |
25 | #include <asm/thread_info.h> | 25 | #include <asm/thread_info.h> |
26 | #include <asm/offsets.h> | 26 | #include <asm/asm-offsets.h> |
27 | 27 | ||
28 | .text | 28 | .text |
29 | 29 | ||
diff --git a/arch/ppc/kernel/swsusp.S b/arch/ppc/kernel/swsusp.S index 55148bb88d39..69773cc1a85f 100644 --- a/arch/ppc/kernel/swsusp.S +++ b/arch/ppc/kernel/swsusp.S | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <asm/cputable.h> | 5 | #include <asm/cputable.h> |
6 | #include <asm/thread_info.h> | 6 | #include <asm/thread_info.h> |
7 | #include <asm/ppc_asm.h> | 7 | #include <asm/ppc_asm.h> |
8 | #include <asm/offsets.h> | 8 | #include <asm/asm-offsets.h> |
9 | 9 | ||
10 | 10 | ||
11 | /* | 11 | /* |
diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S index ab83132a7ed0..3ec87c91343e 100644 --- a/arch/ppc/mm/hashtable.S +++ b/arch/ppc/mm/hashtable.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/cputable.h> | 30 | #include <asm/cputable.h> |
31 | #include <asm/ppc_asm.h> | 31 | #include <asm/ppc_asm.h> |
32 | #include <asm/thread_info.h> | 32 | #include <asm/thread_info.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | 34 | ||
35 | #ifdef CONFIG_SMP | 35 | #ifdef CONFIG_SMP |
36 | .comm mmu_hash_lock,4 | 36 | .comm mmu_hash_lock,4 |
diff --git a/arch/ppc/platforms/pmac_sleep.S b/arch/ppc/platforms/pmac_sleep.S index 016a74649155..8d67adc76925 100644 --- a/arch/ppc/platforms/pmac_sleep.S +++ b/arch/ppc/platforms/pmac_sleep.S | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/cputable.h> | 17 | #include <asm/cputable.h> |
18 | #include <asm/cache.h> | 18 | #include <asm/cache.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/offsets.h> | 20 | #include <asm/asm-offsets.h> |
21 | 21 | ||
22 | #define MAGIC 0x4c617273 /* 'Lars' */ | 22 | #define MAGIC 0x4c617273 /* 'Lars' */ |
23 | 23 | ||
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile index a91daa324e88..0a23aeacba88 100644 --- a/arch/ppc64/Makefile +++ b/arch/ppc64/Makefile | |||
@@ -117,13 +117,6 @@ archclean: | |||
117 | $(Q)$(MAKE) $(clean)=$(boot) | 117 | $(Q)$(MAKE) $(clean)=$(boot) |
118 | $(Q)rm -rf include3 | 118 | $(Q)rm -rf include3 |
119 | 119 | ||
120 | prepare: include/asm-ppc64/offsets.h | ||
121 | |||
122 | arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
123 | include/config/MARKER | ||
124 | |||
125 | include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s | ||
126 | $(call filechk,gen-asm-offsets) | ||
127 | 120 | ||
128 | # Temporary hack until we have migrated to asm-powerpc | 121 | # Temporary hack until we have migrated to asm-powerpc |
129 | include/asm: include3/asm | 122 | include/asm: include3/asm |
@@ -139,5 +132,3 @@ define archhelp | |||
139 | echo ' zImage - zImage for pSeries machines' | 132 | echo ' zImage - zImage for pSeries machines' |
140 | echo ' zImage.initrd - zImage with initrd for pSeries machines' | 133 | echo ' zImage.initrd - zImage with initrd for pSeries machines' |
141 | endef | 134 | endef |
142 | |||
143 | CLEAN_FILES += include/asm-ppc64/offsets.h | ||
diff --git a/arch/ppc64/kernel/cpu_setup_power4.S b/arch/ppc64/kernel/cpu_setup_power4.S index 0482c063c26e..bfce609e8e6b 100644 --- a/arch/ppc64/kernel/cpu_setup_power4.S +++ b/arch/ppc64/kernel/cpu_setup_power4.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/cputable.h> | 16 | #include <asm/cputable.h> |
17 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
18 | #include <asm/offsets.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/cache.h> | 19 | #include <asm/cache.h> |
20 | 20 | ||
21 | _GLOBAL(__970_cpu_preinit) | 21 | _GLOBAL(__970_cpu_preinit) |
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S index bf99b4a92f20..d133a49cdf89 100644 --- a/arch/ppc64/kernel/entry.S +++ b/arch/ppc64/kernel/entry.S | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/mmu.h> | 28 | #include <asm/mmu.h> |
29 | #include <asm/thread_info.h> | 29 | #include <asm/thread_info.h> |
30 | #include <asm/ppc_asm.h> | 30 | #include <asm/ppc_asm.h> |
31 | #include <asm/offsets.h> | 31 | #include <asm/asm-offsets.h> |
32 | #include <asm/cputable.h> | 32 | #include <asm/cputable.h> |
33 | 33 | ||
34 | #ifdef CONFIG_PPC_ISERIES | 34 | #ifdef CONFIG_PPC_ISERIES |
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index b436206e317d..58c314738c99 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mmu.h> | 30 | #include <asm/mmu.h> |
31 | #include <asm/systemcfg.h> | 31 | #include <asm/systemcfg.h> |
32 | #include <asm/ppc_asm.h> | 32 | #include <asm/ppc_asm.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | #include <asm/bug.h> | 34 | #include <asm/bug.h> |
35 | #include <asm/cputable.h> | 35 | #include <asm/cputable.h> |
36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
diff --git a/arch/ppc64/kernel/idle_power4.S b/arch/ppc64/kernel/idle_power4.S index 97e4a2655040..ca02afe2a795 100644 --- a/arch/ppc64/kernel/idle_power4.S +++ b/arch/ppc64/kernel/idle_power4.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | #include <asm/thread_info.h> | 21 | #include <asm/thread_info.h> |
22 | #include <asm/ppc_asm.h> | 22 | #include <asm/ppc_asm.h> |
23 | #include <asm/offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | 24 | ||
25 | #undef DEBUG | 25 | #undef DEBUG |
26 | 26 | ||
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S index c047663eb48d..e7241ad80a08 100644 --- a/arch/ppc64/kernel/misc.S +++ b/arch/ppc64/kernel/misc.S | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
27 | #include <asm/cache.h> | 27 | #include <asm/cache.h> |
28 | #include <asm/ppc_asm.h> | 28 | #include <asm/ppc_asm.h> |
29 | #include <asm/offsets.h> | 29 | #include <asm/asm-offsets.h> |
30 | #include <asm/cputable.h> | 30 | #include <asm/cputable.h> |
31 | 31 | ||
32 | .text | 32 | .text |
diff --git a/arch/ppc64/kernel/vdso32/cacheflush.S b/arch/ppc64/kernel/vdso32/cacheflush.S index 0ed7ea721715..c8db993574ee 100644 --- a/arch/ppc64/kernel/vdso32/cacheflush.S +++ b/arch/ppc64/kernel/vdso32/cacheflush.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | 17 | ||
18 | .text | 18 | .text |
19 | 19 | ||
diff --git a/arch/ppc64/kernel/vdso32/datapage.S b/arch/ppc64/kernel/vdso32/datapage.S index 29b6bd32e1f1..4f4eb0be3992 100644 --- a/arch/ppc64/kernel/vdso32/datapage.S +++ b/arch/ppc64/kernel/vdso32/datapage.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
17 | #include <asm/vdso.h> | 17 | #include <asm/vdso.h> |
18 | 18 | ||
diff --git a/arch/ppc64/kernel/vdso32/gettimeofday.S b/arch/ppc64/kernel/vdso32/gettimeofday.S index 2b48bf1fb109..07f1c1c650c8 100644 --- a/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/arch/ppc64/kernel/vdso32/gettimeofday.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | #include <asm/unistd.h> | 17 | #include <asm/unistd.h> |
18 | 18 | ||
19 | .text | 19 | .text |
diff --git a/arch/ppc64/kernel/vdso64/cacheflush.S b/arch/ppc64/kernel/vdso64/cacheflush.S index e0725b7b7003..d4a0ad28d534 100644 --- a/arch/ppc64/kernel/vdso64/cacheflush.S +++ b/arch/ppc64/kernel/vdso64/cacheflush.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | 17 | ||
18 | .text | 18 | .text |
19 | 19 | ||
diff --git a/arch/ppc64/kernel/vdso64/datapage.S b/arch/ppc64/kernel/vdso64/datapage.S index 18afd971c9d9..ed6e599ae824 100644 --- a/arch/ppc64/kernel/vdso64/datapage.S +++ b/arch/ppc64/kernel/vdso64/datapage.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
17 | #include <asm/vdso.h> | 17 | #include <asm/vdso.h> |
18 | 18 | ||
diff --git a/arch/ppc64/kernel/vdso64/gettimeofday.S b/arch/ppc64/kernel/vdso64/gettimeofday.S index ed3f970ff05e..f6df8028570a 100644 --- a/arch/ppc64/kernel/vdso64/gettimeofday.S +++ b/arch/ppc64/kernel/vdso64/gettimeofday.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/vdso.h> | 16 | #include <asm/vdso.h> |
17 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | 18 | ||
19 | .text | 19 | .text |
20 | /* | 20 | /* |
diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S index 35eb49e1b890..ee5a5d36bfa8 100644 --- a/arch/ppc64/mm/hash_low.S +++ b/arch/ppc64/mm/hash_low.S | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
18 | #include <asm/ppc_asm.h> | 18 | #include <asm/ppc_asm.h> |
19 | #include <asm/offsets.h> | 19 | #include <asm/asm-offsets.h> |
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | 21 | ||
22 | .text | 22 | .text |
diff --git a/arch/ppc64/mm/slb_low.S b/arch/ppc64/mm/slb_low.S index 698d6b9ed6d1..a3a03da503bc 100644 --- a/arch/ppc64/mm/slb_low.S +++ b/arch/ppc64/mm/slb_low.S | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/page.h> | 21 | #include <asm/page.h> |
22 | #include <asm/mmu.h> | 22 | #include <asm/mmu.h> |
23 | #include <asm/ppc_asm.h> | 23 | #include <asm/ppc_asm.h> |
24 | #include <asm/offsets.h> | 24 | #include <asm/asm-offsets.h> |
25 | #include <asm/cputable.h> | 25 | #include <asm/cputable.h> |
26 | 26 | ||
27 | /* void slb_allocate(unsigned long ea); | 27 | /* void slb_allocate(unsigned long ea); |
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index c1ea6bcb77ce..98db30481d97 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
@@ -102,16 +102,6 @@ image: vmlinux | |||
102 | archclean: | 102 | archclean: |
103 | $(Q)$(MAKE) $(clean)=$(boot) | 103 | $(Q)$(MAKE) $(clean)=$(boot) |
104 | 104 | ||
105 | prepare: include/asm-$(ARCH)/offsets.h | ||
106 | |||
107 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
108 | include/config/MARKER | ||
109 | |||
110 | include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
111 | $(call filechk,gen-asm-offsets) | ||
112 | |||
113 | CLEAN_FILES += include/asm-$(ARCH)/offsets.h | ||
114 | |||
115 | # Don't use tabs in echo arguments | 105 | # Don't use tabs in echo arguments |
116 | define archhelp | 106 | define archhelp |
117 | echo '* image - Kernel image for IPL ($(boot)/image)' | 107 | echo '* image - Kernel image for IPL ($(boot)/image)' |
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index cbe7d6a2d02c..58fc7fbcb40e 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/errno.h> | 18 | #include <asm/errno.h> |
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
21 | #include <asm/offsets.h> | 21 | #include <asm/asm-offsets.h> |
22 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
24 | 24 | ||
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index fb77b72ab262..d0c9ffaa25db 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/errno.h> | 18 | #include <asm/errno.h> |
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
21 | #include <asm/offsets.h> | 21 | #include <asm/asm-offsets.h> |
22 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
24 | 24 | ||
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 2710e66fefba..55654b6e16dc 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/config.h> | 30 | #include <linux/config.h> |
31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
32 | #include <asm/lowcore.h> | 32 | #include <asm/lowcore.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | #include <asm/thread_info.h> | 34 | #include <asm/thread_info.h> |
35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
36 | 36 | ||
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 9a8263a153cb..c9ff0404c875 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/config.h> | 30 | #include <linux/config.h> |
31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
32 | #include <asm/lowcore.h> | 32 | #include <asm/lowcore.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | #include <asm/thread_info.h> | 34 | #include <asm/thread_info.h> |
35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
36 | 36 | ||
diff --git a/arch/s390/lib/uaccess.S b/arch/s390/lib/uaccess.S index e8029ef42ef2..88fc94fe6488 100644 --- a/arch/s390/lib/uaccess.S +++ b/arch/s390/lib/uaccess.S | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
13 | #include <asm/lowcore.h> | 13 | #include <asm/lowcore.h> |
14 | #include <asm/offsets.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | .text | 16 | .text |
17 | .align 4 | 17 | .align 4 |
diff --git a/arch/s390/lib/uaccess64.S b/arch/s390/lib/uaccess64.S index 0ca56972f4f0..50219786fc7a 100644 --- a/arch/s390/lib/uaccess64.S +++ b/arch/s390/lib/uaccess64.S | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
13 | #include <asm/lowcore.h> | 13 | #include <asm/lowcore.h> |
14 | #include <asm/offsets.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | .text | 16 | .text |
17 | .align 4 | 17 | .align 4 |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index b5635635b5ee..19f00d57acf0 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
@@ -155,7 +155,7 @@ endif | |||
155 | prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach | 155 | prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach |
156 | 156 | ||
157 | .PHONY: maketools FORCE | 157 | .PHONY: maketools FORCE |
158 | maketools: include/asm-sh/asm-offsets.h include/linux/version.h FORCE | 158 | maketools: include/linux/version.h FORCE |
159 | $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h | 159 | $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h |
160 | 160 | ||
161 | all: zImage | 161 | all: zImage |
@@ -168,14 +168,7 @@ compressed: zImage | |||
168 | archclean: | 168 | archclean: |
169 | $(Q)$(MAKE) $(clean)=$(boot) | 169 | $(Q)$(MAKE) $(clean)=$(boot) |
170 | 170 | ||
171 | CLEAN_FILES += include/asm-sh/machtypes.h include/asm-sh/asm-offsets.h | 171 | CLEAN_FILES += include/asm-sh/machtypes.h |
172 | |||
173 | arch/sh/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
174 | include/asm-sh/.cpu include/asm-sh/.mach | ||
175 | |||
176 | include/asm-sh/asm-offsets.h: arch/sh/kernel/asm-offsets.s | ||
177 | $(call filechk,gen-asm-offsets) | ||
178 | |||
179 | 172 | ||
180 | define archhelp | 173 | define archhelp |
181 | @echo ' zImage - Compressed kernel image (arch/sh/boot/zImage)' | 174 | @echo ' zImage - Compressed kernel image (arch/sh/boot/zImage)' |
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile index b4fd8e13fea9..39073734a476 100644 --- a/arch/sh64/Makefile +++ b/arch/sh64/Makefile | |||
@@ -73,11 +73,7 @@ compressed: zImage | |||
73 | archclean: | 73 | archclean: |
74 | $(Q)$(MAKE) $(clean)=$(boot) | 74 | $(Q)$(MAKE) $(clean)=$(boot) |
75 | 75 | ||
76 | prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h | 76 | prepare: arch/$(ARCH)/lib/syscalltab.h |
77 | |||
78 | include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ | ||
79 | include/asm include/linux/version.h | ||
80 | $(call filechk,gen-asm-offsets) | ||
81 | 77 | ||
82 | define filechk_gen-syscalltab | 78 | define filechk_gen-syscalltab |
83 | (set -e; \ | 79 | (set -e; \ |
@@ -108,7 +104,7 @@ endef | |||
108 | arch/$(ARCH)/lib/syscalltab.h: arch/sh64/kernel/syscalls.S | 104 | arch/$(ARCH)/lib/syscalltab.h: arch/sh64/kernel/syscalls.S |
109 | $(call filechk,gen-syscalltab) | 105 | $(call filechk,gen-syscalltab) |
110 | 106 | ||
111 | CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h | 107 | CLEAN_FILES += arch/$(ARCH)/lib/syscalltab.h |
112 | 108 | ||
113 | define archhelp | 109 | define archhelp |
114 | @echo ' zImage - Compressed kernel image (arch/sh64/boot/zImage)' | 110 | @echo ' zImage - Compressed kernel image (arch/sh64/boot/zImage)' |
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> |
diff --git a/arch/sparc64/kernel/asm-offsets.c b/arch/sparc64/kernel/asm-offsets.c new file mode 100644 index 000000000000..9e263112a6e2 --- /dev/null +++ b/arch/sparc64/kernel/asm-offsets.c | |||
@@ -0,0 +1 @@ | |||
/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */ | |||
diff --git a/arch/um/Makefile b/arch/um/Makefile index b15f6048caae..577b8d1cf1a6 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
@@ -197,6 +197,22 @@ define filechk_umlconfig | |||
197 | sed 's/ CONFIG/ UML_CONFIG/' | 197 | sed 's/ CONFIG/ UML_CONFIG/' |
198 | endef | 198 | endef |
199 | 199 | ||
200 | define filechk_gen-asm-offsets | ||
201 | (set -e; \ | ||
202 | echo "#ifndef __ASM_OFFSETS_H__"; \ | ||
203 | echo "#define __ASM_OFFSETS_H__"; \ | ||
204 | echo "/*"; \ | ||
205 | echo " * DO NOT MODIFY."; \ | ||
206 | echo " *"; \ | ||
207 | echo " * This file was generated by arch/$(ARCH)/Makefile"; \ | ||
208 | echo " *"; \ | ||
209 | echo " */"; \ | ||
210 | echo ""; \ | ||
211 | sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \ | ||
212 | echo ""; \ | ||
213 | echo "#endif" ) | ||
214 | endef | ||
215 | |||
200 | $(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h | 216 | $(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h |
201 | $(call filechk,umlconfig) | 217 | $(call filechk,umlconfig) |
202 | 218 | ||
diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c new file mode 100644 index 000000000000..c13a64a288f6 --- /dev/null +++ b/arch/um/kernel/asm-offsets.c | |||
@@ -0,0 +1 @@ | |||
/* Dummy file to make kbuild happy - unused! */ | |||
diff --git a/arch/v850/Makefile b/arch/v850/Makefile index bf38ca0ad781..8be9aacb20a7 100644 --- a/arch/v850/Makefile +++ b/arch/v850/Makefile | |||
@@ -51,16 +51,4 @@ root_fs_image_force: $(ROOT_FS_IMAGE) | |||
51 | $(OBJCOPY) $(OBJCOPY_FLAGS_BLOB) --rename-section .data=.root,alloc,load,readonly,data,contents $< root_fs_image.o | 51 | $(OBJCOPY) $(OBJCOPY_FLAGS_BLOB) --rename-section .data=.root,alloc,load,readonly,data,contents $< root_fs_image.o |
52 | endif | 52 | endif |
53 | 53 | ||
54 | 54 | CLEAN_FILES += root_fs_image.o | |
55 | prepare: include/asm-$(ARCH)/asm-consts.h | ||
56 | |||
57 | # Generate constants from C code for use by asm files | ||
58 | arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \ | ||
59 | include/config/MARKER | ||
60 | |||
61 | include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s | ||
62 | $(call filechk,gen-asm-offsets) | ||
63 | |||
64 | CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \ | ||
65 | arch/$(ARCH)/kernel/asm-consts.s \ | ||
66 | root_fs_image.o | ||
diff --git a/arch/v850/kernel/asm-consts.c b/arch/v850/kernel/asm-offsets.c index 24f291369070..24f291369070 100644 --- a/arch/v850/kernel/asm-consts.c +++ b/arch/v850/kernel/asm-offsets.c | |||
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S index 895e27b1d839..d991e4547dbb 100644 --- a/arch/v850/kernel/entry.S +++ b/arch/v850/kernel/entry.S | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | #include <asm/errno.h> | 23 | #include <asm/errno.h> |
24 | 24 | ||
25 | #include <asm/asm-consts.h> | 25 | #include <asm/asm-offsets.h> |
26 | 26 | ||
27 | 27 | ||
28 | /* Make a slightly more convenient alias for C_SYMBOL_NAME. */ | 28 | /* Make a slightly more convenient alias for C_SYMBOL_NAME. */ |
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 4c6ed96d5f7c..a9cd42e61828 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile | |||
@@ -86,16 +86,6 @@ install fdimage fdimage144 fdimage288: vmlinux | |||
86 | archclean: | 86 | archclean: |
87 | $(Q)$(MAKE) $(clean)=$(boot) | 87 | $(Q)$(MAKE) $(clean)=$(boot) |
88 | 88 | ||
89 | prepare: include/asm-$(ARCH)/offset.h | ||
90 | |||
91 | arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
92 | include/config/MARKER | ||
93 | |||
94 | include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s | ||
95 | $(call filechk,gen-asm-offsets) | ||
96 | |||
97 | CLEAN_FILES += include/asm-$(ARCH)/offset.h | ||
98 | |||
99 | define archhelp | 89 | define archhelp |
100 | echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)' | 90 | echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)' |
101 | echo ' install - Install kernel using' | 91 | echo ' install - Install kernel using' |
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index f174083d5567..5244f803203d 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #include <asm/dwarf2.h> | 7 | #include <asm/dwarf2.h> |
8 | #include <asm/calling.h> | 8 | #include <asm/calling.h> |
9 | #include <asm/offset.h> | 9 | #include <asm/asm-offsets.h> |
10 | #include <asm/current.h> | 10 | #include <asm/current.h> |
11 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
12 | #include <asm/ia32_unistd.h> | 12 | #include <asm/ia32_unistd.h> |
diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86_64/ia32/vsyscall-syscall.S index e2aaf3de8a42..b024965bb689 100644 --- a/arch/x86_64/ia32/vsyscall-syscall.S +++ b/arch/x86_64/ia32/vsyscall-syscall.S | |||
@@ -3,7 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <asm/ia32_unistd.h> | 5 | #include <asm/ia32_unistd.h> |
6 | #include <asm/offset.h> | 6 | #include <asm/asm-offsets.h> |
7 | #include <asm/segment.h> | 7 | #include <asm/segment.h> |
8 | 8 | ||
9 | .text | 9 | .text |
diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86_64/ia32/vsyscall-sysenter.S index 8fb8e0ff3afa..71f3de586b56 100644 --- a/arch/x86_64/ia32/vsyscall-sysenter.S +++ b/arch/x86_64/ia32/vsyscall-sysenter.S | |||
@@ -3,7 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <asm/ia32_unistd.h> | 5 | #include <asm/ia32_unistd.h> |
6 | #include <asm/offset.h> | 6 | #include <asm/asm-offsets.h> |
7 | 7 | ||
8 | .text | 8 | .text |
9 | .section .text.vsyscall,"ax" | 9 | .section .text.vsyscall,"ax" |
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index be51dbe1f75e..3620508c8bd9 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <asm/errno.h> | 36 | #include <asm/errno.h> |
37 | #include <asm/dwarf2.h> | 37 | #include <asm/dwarf2.h> |
38 | #include <asm/calling.h> | 38 | #include <asm/calling.h> |
39 | #include <asm/offset.h> | 39 | #include <asm/asm-offsets.h> |
40 | #include <asm/msr.h> | 40 | #include <asm/msr.h> |
41 | #include <asm/unistd.h> | 41 | #include <asm/unistd.h> |
42 | #include <asm/thread_info.h> | 42 | #include <asm/thread_info.h> |
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm.S index 53f8e1659511..4d659e97df10 100644 --- a/arch/x86_64/kernel/suspend_asm.S +++ b/arch/x86_64/kernel/suspend_asm.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
15 | #include <asm/segment.h> | 15 | #include <asm/segment.h> |
16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
17 | #include <asm/offset.h> | 17 | #include <asm/asm-offsets.h> |
18 | 18 | ||
19 | ENTRY(swsusp_arch_suspend) | 19 | ENTRY(swsusp_arch_suspend) |
20 | 20 | ||
diff --git a/arch/x86_64/lib/copy_user.S b/arch/x86_64/lib/copy_user.S index bd556c804248..dfa358b05c89 100644 --- a/arch/x86_64/lib/copy_user.S +++ b/arch/x86_64/lib/copy_user.S | |||
@@ -7,7 +7,7 @@ | |||
7 | #define FIX_ALIGNMENT 1 | 7 | #define FIX_ALIGNMENT 1 |
8 | 8 | ||
9 | #include <asm/current.h> | 9 | #include <asm/current.h> |
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/thread_info.h> | 11 | #include <asm/thread_info.h> |
12 | #include <asm/cpufeature.h> | 12 | #include <asm/cpufeature.h> |
13 | 13 | ||
diff --git a/arch/x86_64/lib/getuser.S b/arch/x86_64/lib/getuser.S index f80bafee8669..3844d5e885a4 100644 --- a/arch/x86_64/lib/getuser.S +++ b/arch/x86_64/lib/getuser.S | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <asm/page.h> | 30 | #include <asm/page.h> |
31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
32 | #include <asm/offset.h> | 32 | #include <asm/asm-offsets.h> |
33 | #include <asm/thread_info.h> | 33 | #include <asm/thread_info.h> |
34 | 34 | ||
35 | .text | 35 | .text |
diff --git a/arch/x86_64/lib/putuser.S b/arch/x86_64/lib/putuser.S index 5828b8191667..7f5593974e2d 100644 --- a/arch/x86_64/lib/putuser.S +++ b/arch/x86_64/lib/putuser.S | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <linux/linkage.h> | 27 | #include <linux/linkage.h> |
28 | #include <asm/page.h> | 28 | #include <asm/page.h> |
29 | #include <asm/errno.h> | 29 | #include <asm/errno.h> |
30 | #include <asm/offset.h> | 30 | #include <asm/asm-offsets.h> |
31 | #include <asm/thread_info.h> | 31 | #include <asm/thread_info.h> |
32 | 32 | ||
33 | .text | 33 | .text |
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 27847e4ffcbf..67ef4cd173b9 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
@@ -66,13 +66,7 @@ boot := arch/xtensa/boot | |||
66 | 66 | ||
67 | archinc := include/asm-xtensa | 67 | archinc := include/asm-xtensa |
68 | 68 | ||
69 | arch/xtensa/kernel/asm-offsets.s: \ | 69 | prepare: $(archinc)/.platform |
70 | arch/xtensa/kernel/asm-offsets.c $(archinc)/.platform | ||
71 | |||
72 | include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s | ||
73 | $(call filechk,gen-asm-offsets) | ||
74 | |||
75 | prepare: $(archinc)/.platform $(archinc)/offsets.h | ||
76 | 70 | ||
77 | # Update machine cpu and platform symlinks if something which affects | 71 | # Update machine cpu and platform symlinks if something which affects |
78 | # them changed. | 72 | # them changed. |
@@ -94,7 +88,7 @@ bzImage : zImage | |||
94 | zImage zImage.initrd: vmlinux | 88 | zImage zImage.initrd: vmlinux |
95 | $(Q)$(MAKE) $(build)=$(boot) $@ | 89 | $(Q)$(MAKE) $(build)=$(boot) $@ |
96 | 90 | ||
97 | CLEAN_FILES += arch/xtensa/vmlinux.lds $(archinc)/offset.h \ | 91 | CLEAN_FILES += arch/xtensa/vmlinux.lds \ |
98 | $(archinc)/platform $(archinc)/xtensa/config \ | 92 | $(archinc)/platform $(archinc)/xtensa/config \ |
99 | $(archinc)/.platform | 93 | $(archinc)/.platform |
100 | 94 | ||
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S index 74b1e90ef08c..a4956578a24d 100644 --- a/arch/xtensa/kernel/align.S +++ b/arch/xtensa/kernel/align.S | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
20 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
21 | #include <asm/current.h> | 21 | #include <asm/current.h> |
22 | #include <asm/offsets.h> | 22 | #include <asm/asm-offsets.h> |
23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
24 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
25 | #include <asm/page.h> | 25 | #include <asm/page.h> |
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index c64a01f71de6..5c018c503dfa 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/linkage.h> | 16 | #include <linux/linkage.h> |
17 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 4099703b14be..c83bb0d41787 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/mmu.h> | 43 | #include <asm/mmu.h> |
44 | #include <asm/irq.h> | 44 | #include <asm/irq.h> |
45 | #include <asm/atomic.h> | 45 | #include <asm/atomic.h> |
46 | #include <asm/offsets.h> | 46 | #include <asm/asm-offsets.h> |
47 | #include <asm/coprocessor.h> | 47 | #include <asm/coprocessor.h> |
48 | 48 | ||
49 | extern void ret_from_fork(void); | 49 | extern void ret_from_fork(void); |
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S index 81808f0c6742..0e74397bfa2b 100644 --- a/arch/xtensa/kernel/vectors.S +++ b/arch/xtensa/kernel/vectors.S | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <asm/ptrace.h> | 46 | #include <asm/ptrace.h> |
47 | #include <asm/ptrace.h> | 47 | #include <asm/ptrace.h> |
48 | #include <asm/current.h> | 48 | #include <asm/current.h> |
49 | #include <asm/offsets.h> | 49 | #include <asm/asm-offsets.h> |
50 | #include <asm/pgtable.h> | 50 | #include <asm/pgtable.h> |
51 | #include <asm/processor.h> | 51 | #include <asm/processor.h> |
52 | #include <asm/page.h> | 52 | #include <asm/page.h> |
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index e2cb9fa6f563..8fbf791651bf 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h | |||
@@ -48,7 +48,7 @@ struct thread_info { | |||
48 | 48 | ||
49 | #else /* !__ASSEMBLY__ */ | 49 | #else /* !__ASSEMBLY__ */ |
50 | 50 | ||
51 | #include <asm/asm_offsets.h> | 51 | #include <asm/asm-offsets.h> |
52 | 52 | ||
53 | #endif | 53 | #endif |
54 | 54 | ||
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index 0bef19538406..c8766def9ee6 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h | |||
@@ -57,7 +57,7 @@ | |||
57 | #include <linux/config.h> | 57 | #include <linux/config.h> |
58 | 58 | ||
59 | #include <asm/fpu.h> | 59 | #include <asm/fpu.h> |
60 | #include <asm/offsets.h> | 60 | #include <asm/asm-offsets.h> |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Base-2 logarithm of number of pages to allocate per task structure | 63 | * Base-2 logarithm of number of pages to allocate per task structure |
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index 7dc8951708a3..b2c79f0694f8 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #ifndef _ASM_IA64_THREAD_INFO_H | 5 | #ifndef _ASM_IA64_THREAD_INFO_H |
6 | #define _ASM_IA64_THREAD_INFO_H | 6 | #define _ASM_IA64_THREAD_INFO_H |
7 | 7 | ||
8 | #include <asm/offsets.h> | 8 | #include <asm/asm-offsets.h> |
9 | #include <asm/processor.h> | 9 | #include <asm/processor.h> |
10 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
11 | 11 | ||
diff --git a/include/asm-mips/asmmacro-32.h b/include/asm-mips/asmmacro-32.h index ac8823df2554..11daf5ceb7b4 100644 --- a/include/asm-mips/asmmacro-32.h +++ b/include/asm-mips/asmmacro-32.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _ASM_ASMMACRO_32_H | 7 | #ifndef _ASM_ASMMACRO_32_H |
8 | #define _ASM_ASMMACRO_32_H | 8 | #define _ASM_ASMMACRO_32_H |
9 | 9 | ||
10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
12 | #include <asm/fpregdef.h> | 12 | #include <asm/fpregdef.h> |
13 | #include <asm/mipsregs.h> | 13 | #include <asm/mipsregs.h> |
diff --git a/include/asm-mips/asmmacro-64.h b/include/asm-mips/asmmacro-64.h index bbed35511f5a..559c355b9b86 100644 --- a/include/asm-mips/asmmacro-64.h +++ b/include/asm-mips/asmmacro-64.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #ifndef _ASM_ASMMACRO_64_H | 8 | #ifndef _ASM_ASMMACRO_64_H |
9 | #define _ASM_ASMMACRO_64_H | 9 | #define _ASM_ASMMACRO_64_H |
10 | 10 | ||
11 | #include <asm/offset.h> | 11 | #include <asm/asm-offsets.h> |
12 | #include <asm/regdef.h> | 12 | #include <asm/regdef.h> |
13 | #include <asm/fpregdef.h> | 13 | #include <asm/fpregdef.h> |
14 | #include <asm/mipsregs.h> | 14 | #include <asm/mipsregs.h> |
diff --git a/include/asm-mips/sim.h b/include/asm-mips/sim.h index 3ccfe09fa744..9c2af1b00e19 100644 --- a/include/asm-mips/sim.h +++ b/include/asm-mips/sim.h | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | 13 | ||
14 | #include <asm/offset.h> | 14 | #include <asm/asm-offsets.h> |
15 | 15 | ||
16 | #define __str2(x) #x | 16 | #define __str2(x) #x |
17 | #define __str(x) __str2(x) | 17 | #define __str(x) __str2(x) |
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index fb42f99f8527..7b5e64600bc8 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <asm/asm.h> | 16 | #include <asm/asm.h> |
17 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
18 | #include <asm/offset.h> | 18 | #include <asm/asm-offsets.h> |
19 | 19 | ||
20 | .macro SAVE_AT | 20 | .macro SAVE_AT |
21 | .set push | 21 | .set push |
diff --git a/include/asm-parisc/assembly.h b/include/asm-parisc/assembly.h index cbc286f49b36..30b023411fef 100644 --- a/include/asm-parisc/assembly.h +++ b/include/asm-parisc/assembly.h | |||
@@ -63,7 +63,7 @@ | |||
63 | .level 2.0w | 63 | .level 2.0w |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #include <asm/offsets.h> | 66 | #include <asm/asm-offsets.h> |
67 | #include <asm/page.h> | 67 | #include <asm/page.h> |
68 | 68 | ||
69 | #include <asm/asmregs.h> | 69 | #include <asm/asmregs.h> |
diff --git a/include/asm-sparc/ptrace.h b/include/asm-sparc/ptrace.h index dd9d94d7e0ae..a8ecb2d6977a 100644 --- a/include/asm-sparc/ptrace.h +++ b/include/asm-sparc/ptrace.h | |||
@@ -73,11 +73,11 @@ extern void show_regs(struct pt_regs *); | |||
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | /* | 75 | /* |
76 | * The asm_offsets.h is a generated file, so we cannot include it. | 76 | * The asm-offsets.h is a generated file, so we cannot include it. |
77 | * It may be OK for glibc headers, but it's utterly pointless for C code. | 77 | * It may be OK for glibc headers, but it's utterly pointless for C code. |
78 | * The assembly code using those offsets has to include it explicitly. | 78 | * The assembly code using those offsets has to include it explicitly. |
79 | */ | 79 | */ |
80 | /* #include <asm/asm_offsets.h> */ | 80 | /* #include <asm/asm-offsets.h> */ |
81 | 81 | ||
82 | /* These are for pt_regs. */ | 82 | /* These are for pt_regs. */ |
83 | #define PT_PSR 0x0 | 83 | #define PT_PSR 0x0 |
diff --git a/include/asm-x86_64/current.h b/include/asm-x86_64/current.h index 7db560ee6f70..bc8adecee66d 100644 --- a/include/asm-x86_64/current.h +++ b/include/asm-x86_64/current.h | |||
@@ -17,7 +17,7 @@ static inline struct task_struct *get_current(void) | |||
17 | #else | 17 | #else |
18 | 18 | ||
19 | #ifndef ASM_OFFSET_H | 19 | #ifndef ASM_OFFSET_H |
20 | #include <asm/offset.h> | 20 | #include <asm/asm-offsets.h> |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | 23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg |
diff --git a/include/asm-xtensa/ptrace.h b/include/asm-xtensa/ptrace.h index 2848a5ff8349..aa4fd7fb3ce7 100644 --- a/include/asm-xtensa/ptrace.h +++ b/include/asm-xtensa/ptrace.h | |||
@@ -127,7 +127,7 @@ extern void show_regs(struct pt_regs *); | |||
127 | #else /* __ASSEMBLY__ */ | 127 | #else /* __ASSEMBLY__ */ |
128 | 128 | ||
129 | #ifdef __KERNEL__ | 129 | #ifdef __KERNEL__ |
130 | # include <asm/offsets.h> | 130 | # include <asm/asm-offsets.h> |
131 | #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) | 131 | #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) |
132 | #endif | 132 | #endif |
133 | 133 | ||
diff --git a/include/asm-xtensa/uaccess.h b/include/asm-xtensa/uaccess.h index fc268ac923c0..06a22b83ba17 100644 --- a/include/asm-xtensa/uaccess.h +++ b/include/asm-xtensa/uaccess.h | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #define _ASMLANGUAGE | 26 | #define _ASMLANGUAGE |
27 | #include <asm/current.h> | 27 | #include <asm/current.h> |
28 | #include <asm/offsets.h> | 28 | #include <asm/asm-offsets.h> |
29 | #include <asm/processor.h> | 29 | #include <asm/processor.h> |
30 | 30 | ||
31 | /* | 31 | /* |