diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /include/asm-m68k/entry.h | |
parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) |
Merge with Linux 2.3.41.
Diffstat (limited to 'include/asm-m68k/entry.h')
-rw-r--r-- | include/asm-m68k/entry.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-m68k/entry.h b/include/asm-m68k/entry.h index 56ab0dcf8..3575894b5 100644 --- a/include/asm-m68k/entry.h +++ b/include/asm-m68k/entry.h @@ -34,10 +34,6 @@ * the whole kernel. */ -#ifdef __ASSEMBLY__ - -#define curptr a2 - /* the following macro is used when enabling interrupts */ #if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES) /* block out HSYNC on the atari */ @@ -49,6 +45,10 @@ #define MAX_NOINT_IPL 0 #endif /* machine compilation types */ +#ifdef __ASSEMBLY__ + +#define curptr a2 + LFLUSH_I_AND_D = 0x00000808 LSIGTRAP = 5 @@ -162,7 +162,7 @@ PF_DTRACE_BIT = 5 #endif #define GET_CURRENT(tmp) \ "movel %%sp,"#tmp"\n\t" \ - "andw #-KTHREAD_SIZE,"#tmp"\n\t" \ + "andw #-"STR(KTHREAD_SIZE)","#tmp"\n\t" \ "movel "#tmp",%%a2" #endif |