diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Makefile | 35 | ||||
-rw-r--r-- | arch/mips/kernel/r2300_fpu.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/r2300_switch.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/r4k_fpu.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/r4k_switch.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/r6000_fpu.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/syscall.c | 2 | ||||
-rw-r--r-- | arch/mips/lib-32/memset.S | 2 | ||||
-rw-r--r-- | arch/mips/lib-64/memset.S | 2 | ||||
-rw-r--r-- | arch/mips/lib/memcpy.S | 2 | ||||
-rw-r--r-- | arch/mips/lib/strlen_user.S | 2 | ||||
-rw-r--r-- | arch/mips/lib/strncpy_user.S | 2 | ||||
-rw-r--r-- | arch/mips/lib/strnlen_user.S | 2 |
15 files changed, 16 insertions, 47 deletions
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) \ |