Merge tag 'uml-for-linus-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / um / shared / sysdep / stub_32.h

diff --git a/arch/x86/um/shared/sysdep/stub_32.h b/arch/x86/um/shared/sysdep/stub_32.h
index 38fa894..ea8b5a2 100644 (file)
--- a/arch/x86/um/shared/sysdep/stub_32.h
+++ b/arch/x86/um/shared/sysdep/stub_32.h
@@ -12,72 +12,79 @@
 #define STUB_MMAP_NR __NR_mmap2
 #define MMAP_OFFSET(o) ((o) >> UM_KERN_PAGE_SHIFT)
 
-static inline long stub_syscall0(long syscall)
+static __always_inline long stub_syscall0(long syscall)
 {
        long ret;
 
-       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall));
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall)
+                       : "memory");
 
        return ret;
 }
 
-static inline long stub_syscall1(long syscall, long arg1)
+static __always_inline long stub_syscall1(long syscall, long arg1)
 {
        long ret;
 
-       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1));
+       __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1)
+                       : "memory");
 
        return ret;
 }
 
-static inline long stub_syscall2(long syscall, long arg1, long arg2)
+static __always_inline long stub_syscall2(long syscall, long arg1, long arg2)
 {
        long ret;
 
        __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
-                       "c" (arg2));
+                       "c" (arg2)
+                       : "memory");
 
        return ret;
 }
 
-static inline long stub_syscall3(long syscall, long arg1, long arg2, long arg3)
+static __always_inline long stub_syscall3(long syscall, long arg1, long arg2,
+                                         long arg3)
 {
        long ret;
 
        __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
-                       "c" (arg2), "d" (arg3));
+                       "c" (arg2), "d" (arg3)
+                       : "memory");
 
        return ret;
 }
 
-static inline long stub_syscall4(long syscall, long arg1, long arg2, long arg3,
-                                long arg4)
+static __always_inline long stub_syscall4(long syscall, long arg1, long arg2,
+                                         long arg3, long arg4)
 {
        long ret;
 
        __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
-                       "c" (arg2), "d" (arg3), "S" (arg4));
+                       "c" (arg2), "d" (arg3), "S" (arg4)
+                       : "memory");
 
        return ret;
 }
 
-static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
-                                long arg4, long arg5)
+static __always_inline long stub_syscall5(long syscall, long arg1, long arg2,
+                                         long arg3, long arg4, long arg5)
 {
        long ret;
 
        __asm__ volatile ("int $0x80" : "=a" (ret) : "0" (syscall), "b" (arg1),
-                       "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5));
+                       "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5)
+                       : "memory");
 
        return ret;
 }
 
-static inline void trap_myself(void)
+static __always_inline void trap_myself(void)
 {
        __asm("int3");
 }
 
-static inline void remap_stack_and_trap(void)
+static __always_inline void remap_stack_and_trap(void)
 {
        __asm__ volatile (
                "movl %%esp,%%ebx ;"