syscall_exec16: revert unneeded ifdeffery in core code
authorAlan Cox <alan@linux.intel.com>
Mon, 19 Oct 2015 20:52:54 +0000 (21:52 +0100)
committerAlan Cox <alan@linux.intel.com>
Mon, 19 Oct 2015 20:52:54 +0000 (21:52 +0100)
Kernel/syscall_exec16.c

index d0b7431..46e77e6 100644 (file)
@@ -76,14 +76,8 @@ char *envp[];
 static int header_ok(uint8_t *pp)
 {
        register uint8_t *p = pp;
-       #if defined(EMAGIC)
-               if ((*p != EMAGIC)
-               #if defined(EMAGIC_2)
-                       && (*p != EMAGIC_2)
-               #endif
-               )
-                       return 0;
-       #endif
+       if (*p != EMAGIC && *p != EMAGIC_2)
+               return 0;
        p += 3;
        if (*p++ != 'F' || *p++ != 'Z' || *p++ != 'X' || *p++ != '1')
                return 0;