diff options
| -rw-r--r-- | arch/mips/tools/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips64/tools/Makefile | 3 | ||||
| -rw-r--r-- | include/asm-mips/offset.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/ptrace.h | 10 | ||||
| -rw-r--r-- | include/asm-mips64/offset.h | 1 | ||||
| -rw-r--r-- | include/asm-mips64/ptrace.h | 10 |
6 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/tools/Makefile b/arch/mips/tools/Makefile index ec51fc544..e8474a4c2 100644 --- a/arch/mips/tools/Makefile +++ b/arch/mips/tools/Makefile @@ -18,11 +18,10 @@ $(TARGET): offset.h offset.h: offset.s sed -n '/^@@@/s///p' $^ >$@ -offset.s: offset.c +offset.s: offset.c $(TOPDIR)/.config clean: rm -f offset.[hs] $(TARGET).new rm -f $(TARGET) - echo "/* dummy */" >$(TARGET) include $(TOPDIR)/Rules.make diff --git a/arch/mips64/tools/Makefile b/arch/mips64/tools/Makefile index 033c4eedd..748c22039 100644 --- a/arch/mips64/tools/Makefile +++ b/arch/mips64/tools/Makefile @@ -19,11 +19,10 @@ $(TARGET): offset.h offset.h: offset.s sed -n '/^@@@/s///p' $^ >$@ -offset.s: offset.c +offset.s: offset.c $(TOPDIR)/.config clean: rm -f offset.[hs] $(TARGET).new rm -f $(TARGET) - echo "/* dummy */" >$(TARGET) include $(TOPDIR)/Rules.make diff --git a/include/asm-mips/offset.h b/include/asm-mips/offset.h deleted file mode 100644 index 2997587d8..000000000 --- a/include/asm-mips/offset.h +++ /dev/null @@ -1 +0,0 @@ -/* dummy */ diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h index 559edac6a..b395fe1be 100644 --- a/include/asm-mips/ptrace.h +++ b/include/asm-mips/ptrace.h @@ -25,7 +25,7 @@ #define FPC_CSR 69 #define FPC_EIR 70 -#ifndef __ASSEMBLY__ +#ifndef _LANGUAGE_ASSEMBLY /* * This struct defines the way the registers are stored on the stack during a * system call/exception. As usual the registers k0/k1 aren't being saved. @@ -50,13 +50,15 @@ struct pt_regs { unsigned long cp0_cause; }; -#endif /* !(__ASSEMBLY__) */ +#endif /* !(_LANGUAGE_ASSEMBLY) */ +#ifdef _LANGUAGE_ASSEMBLY #include <asm/offset.h> +#endif #ifdef __KERNEL__ -#ifndef __ASSEMBLY__ +#ifndef _LANGUAGE_ASSEMBLY /* * Does the process account for user or for system time? */ @@ -65,7 +67,7 @@ struct pt_regs { #define instruction_pointer(regs) ((regs)->cp0_epc) extern void show_regs(struct pt_regs *); -#endif /* !(__ASSEMBLY__) */ +#endif /* !(_LANGUAGE_ASSEMBLY) */ #endif diff --git a/include/asm-mips64/offset.h b/include/asm-mips64/offset.h deleted file mode 100644 index 2997587d8..000000000 --- a/include/asm-mips64/offset.h +++ /dev/null @@ -1 +0,0 @@ -/* dummy */ diff --git a/include/asm-mips64/ptrace.h b/include/asm-mips64/ptrace.h index ff5745e24..fcf067d17 100644 --- a/include/asm-mips64/ptrace.h +++ b/include/asm-mips64/ptrace.h @@ -22,7 +22,7 @@ #define FPC_CSR 69 #define FPC_EIR 70 -#ifndef __ASSEMBLY__ +#ifndef _LANGUAGE_ASSEMBLY #define abi64_no_regargs \ unsigned long __dummy0, \ @@ -55,19 +55,21 @@ struct pt_regs { unsigned long cp0_cause; }; -#endif /* !(__ASSEMBLY__) */ +#endif /* !(_LANGUAGE_ASSEMBLY__) */ +#ifdef _LANGUAGE_ASSEMBLY #include <asm/offset.h> +#endif /* (_LANGUAGE_ASSEMBLY__) */ #ifdef __KERNEL__ -#ifndef __ASSEMBLY__ +#ifndef _LANGUAGE_ASSEMBLY #define instruction_pointer(regs) ((regs)->cp0_epc) extern void (*_show_regs)(struct pt_regs *); #define show_regs(regs) _show_regs(regs) -#endif /* !(__ASSEMBLY__) */ +#endif /* !(_LANGUAGE_ASSEMBLY__) */ #endif |