patch-2.4.19 linux-2.4.19/include/asm-s390/system.h

Next file: linux-2.4.19/include/asm-s390/timex.h
Previous file: linux-2.4.19/include/asm-s390/spinlock.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/include/asm-s390/system.h linux-2.4.19/include/asm-s390/system.h
@@ -12,6 +12,7 @@
 #define __ASM_SYSTEM_H
 
 #include <linux/config.h>
+#include <asm/types.h>
 #ifdef __KERNEL__
 #include <asm/lowcore.h>
 #endif
@@ -23,7 +24,7 @@
                 break;                                                       \
 	save_fp_regs1(&prev->thread.fp_regs);                                \
 	restore_fp_regs1(&next->thread.fp_regs);              		     \
-	last = resume(&prev->thread,&next->thread);                          \
+	last = resume(prev,next);					     \
 } while (0)
 
 struct task_struct;
@@ -97,8 +98,6 @@
                                 : "+d&" (x) : "a" (ptr)
                                 : "memory", "cc", "0" );
                         break;
-               default:
-                        abort();
         }
         return x;
 }
@@ -132,24 +131,24 @@
 #define __sti() ({ \
         __u8 dummy; \
         __asm__ __volatile__ ( \
-                "stosm %0,0x03" : "=m" (dummy) : : "memory"); \
+                "stosm 0(%0),0x03" : : "a" (&dummy) : "memory"); \
         })
 
 #define __cli() ({ \
         __u32 flags; \
         __asm__ __volatile__ ( \
-                "stnsm %0,0xFC" : "=m" (flags) : : "memory"); \
+                "stnsm 0(%0),0xFC" : : "a" (&flags) : "memory"); \
         flags; \
         })
 
 #define __save_flags(x) \
-        __asm__ __volatile__("stosm %0,0" : "=m" (x) : : "memory")
+        __asm__ __volatile__("stosm 0(%0),0" : : "a" (&x) : "memory")
 
 #define __restore_flags(x) \
-        __asm__ __volatile__("ssm   %0" : : "m" (x) : "memory")
+        __asm__ __volatile__("ssm   0(%0)" : : "a" (&x) : "memory")
 
 #define __load_psw(psw) \
-	__asm__ __volatile__("lpsw %0" : : "m" (psw) : "cc" );
+	__asm__ __volatile__("lpsw 0(%0)" : : "a" (&psw) : "cc" );
 
 #define __ctl_load(array, low, high) ({ \
 	__asm__ __volatile__ ( \
@@ -244,7 +243,7 @@
 #endif
 
 #ifdef __KERNEL__
-extern struct task_struct *resume(void *,void *);
+extern struct task_struct *resume(void *, void *);
 
 extern int save_fp_regs1(s390_fp_regs *fpregs);
 extern void save_fp_regs(s390_fp_regs *fpregs);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)