1 files changed, 6 insertions, 4 deletions

diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index 4dc55f10cd18..39c0d7145d31 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -13,11 +13,13 @@
 /* This is in a separate file because it needs to be compiled with any
  * extraneous gcc flags (-pg, -fprofile-arcs, -ftest-coverage) disabled
  */
+
+#define STUB_DATA(field) (((struct stub_data *) UML_CONFIG_STUB_DATA)->field)
+
 void __attribute__ ((__section__ (".__syscall_stub")))
 stub_clone_handler(void)
 {
         long err;
-        struct stub_data *from = (struct stub_data *) UML_CONFIG_STUB_DATA;
 
         err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
                             UML_CONFIG_STUB_DATA + PAGE_SIZE / 2 -
@@ -30,15 +32,15 @@ stub_clone_handler(void)
                 goto out;
 
         err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
-                            (long) &from->timer, 0);
+                            (long) &STUB_DATA(timer), 0);
         if(err)
                 goto out;
 
         err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA, PAGE_SIZE,
                             PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,
-                            from->fd, from->offset);
+                            STUB_DATA(fd), STUB_DATA(offset));
  out:
         /* save current result. Parent: pid; child: retcode of mmap */
-        from->err = err;
+        STUB_DATA(err) = err;
         trap_myself();
 }