diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 2000-05-26 19:35:56 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 2000-05-26 19:35:56 +0000 |
| commit | 8be33b4a06c66b9f333ff106213280815a22901c (patch) | |
| tree | 9c178fe0980c962450b5c699621f3df15a4d0963 /include | |
| parent | e3f4987b05b99df724313e4906971e0c2392e9d5 (diff) | |
This should resolve most of the offset.h issues which popped up lately, I hope.
* #include <asm/offset.h> #ifdef'd: init/main.c and $(arch)/tools/offset.c
compile without include/asm-$(ARCH)/offset.h.
* include/asm-$(ARCH)/offset.h is now depending on $(TOPDIR)/.config:
offset.h is beeing rebuilt when .config changes. Please don't count on
that, makedep doesn't do it's job very well in this case and objects
depending on offset.h aren't neccesarily rebuilt :(
Diffstat (limited to 'include')
| -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 |
4 files changed, 12 insertions, 10 deletions
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 |