diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /include/asm-m68k/entry.h | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'include/asm-m68k/entry.h')
| -rw-r--r-- | include/asm-m68k/entry.h | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/include/asm-m68k/entry.h b/include/asm-m68k/entry.h index 3575894b5..444d5ba35 100644 --- a/include/asm-m68k/entry.h +++ b/include/asm-m68k/entry.h @@ -4,9 +4,6 @@ #include <linux/config.h> #include <asm/setup.h> #include <asm/page.h> -#ifdef CONFIG_KGDB -#include <asm/kgdb.h> -#endif /* * Stack layout in 'ret_from_exception': @@ -69,7 +66,7 @@ PF_DTRACE_BIT = 5 * regs a3-a6 and d6-d7 are preserved by C code * the kernel doesn't mess with usp unless it needs to */ -#ifndef CONFIG_KGDB + /* * a -1 in the orig_d0 field signifies * that the stack frame is NOT for syscall @@ -87,27 +84,6 @@ PF_DTRACE_BIT = 5 movel %d0,%sp@- | d0 moveml %d1-%d5/%a0-%a1/%curptr,%sp@- .endm -#else -/* Need to save the "missing" registers for kgdb... - */ -.macro save_all_int - clrl %sp@- | stk_adj - pea -1:w | orig d0 - movel %d0,%sp@- | d0 - moveml %d1-%d5/%a0-%a1/%curptr,%sp@- - moveml %d6-%d7,kgdb_registers+GDBOFFA_D6 - moveml %a3-%a6,kgdb_registers+GDBOFFA_A3 -.endm - -.macro save_all_sys - clrl %sp@- | stk_adj - movel %d0,%sp@- | orig d0 - movel %d0,%sp@- | d0 - moveml %d1-%d5/%a0-%a1/%curptr,%sp@- - moveml %d6-%d7,kgdb_registers+GDBOFFA_D6 - moveml %a3-%a6,kgdb_registers+GDBOFFA_A3 -.endm -#endif .macro restore_all moveml %sp@+,%a0-%a1/%curptr/%d1-%d5 @@ -145,21 +121,11 @@ PF_DTRACE_BIT = 5 #define PT_OFF_ORIG_D0 0x24 #define PT_OFF_FORMATVEC 0x32 #define PT_OFF_SR 0x2C -#ifndef CONFIG_KGDB #define SAVE_ALL_INT \ "clrl %%sp@-;" /* stk_adj */ \ "pea -1:w;" /* orig d0 = -1 */ \ "movel %%d0,%%sp@-;" /* d0 */ \ "moveml %%d1-%%d5/%%a0-%%a2,%%sp@-" -#else -#define SAVE_ALL_INT \ - "clrl %%sp@-\n\t" /* stk_adj */ \ - "pea -1:w\n\t" /* orig d0 = -1 */ \ - "movel %%d0,%%sp@-\n\t" /* d0 */ \ - "moveml %%d1-%%d5/%%a0-%%a2,%%sp@-\n\t" \ - "moveml %%d6-%%d7,kgdb_registers+"STR(GDBOFFA_D6)"\n\t" \ - "moveml %%a3-%%a6,kgdb_registers+"STR(GDBOFFA_A3) -#endif #define GET_CURRENT(tmp) \ "movel %%sp,"#tmp"\n\t" \ "andw #-"STR(KTHREAD_SIZE)","#tmp"\n\t" \ |