patch-2.3.41 linux/include/asm-m68k/entry.h

• Lines: 31
• Date: Wed Jan 26 12:44:21 2000
• Orig file: v2.3.40/linux/include/asm-m68k/entry.h
• Orig date: Tue Sep 7 12:14:07 1999

diff -u --recursive --new-file v2.3.40/linux/include/asm-m68k/entry.h linux/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 @@
 #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