Automerge

include/asm-alpha/unistd.h

@@ -597,4 +597,12 @@ static inline long delete_module(const char *name)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ALPHA_UNISTD_H */

include/asm-arm/unistd.h

@@ -466,4 +466,13 @@ static inline pid_t wait(int * wait_stat)
 static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp);
 
 #endif
+
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* __ASM_ARM_UNISTD_H */

include/asm-cris/unistd.h

@@ -395,4 +395,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_CRIS_UNISTD_H_ */

include/asm-i386/unistd.h

@@ -371,4 +371,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_I386_UNISTD_H_ */

include/asm-ia64/unistd.h

@@ -325,5 +325,14 @@ wait (int * wait_stat)
 }
 
 #endif /* __KERNEL_SYSCALLS__ */
+
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_IA64_UNISTD_H */

include/asm-m68k/unistd.h

@@ -357,4 +357,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_M68K_UNISTD_H_ */

include/asm-mips/unistd.h

@@ -488,4 +488,12 @@ static inline pid_t wait(int * wait_stat)
 #endif /* !defined (__KERNEL_SYSCALLS__) */
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_UNISTD_H */

include/asm-mips64/unistd.h

@@ -814,4 +814,12 @@ static inline pid_t wait(int * wait_stat)
 #endif /* !defined (__KERNEL_SYSCALLS__) */
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_UNISTD_H */

include/asm-parisc/unistd.h

@@ -900,4 +900,12 @@ static inline int execve(char *filename, char * argv [],
 
 #undef STR
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_PARISC_UNISTD_H_ */

include/asm-ppc/unistd.h

@@ -437,4 +437,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif /* __KERNEL_SYSCALLS__ */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_PPC_UNISTD_H_ */

include/asm-ppc64/unistd.h

@@ -444,4 +444,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif /* __KERNEL_SYSCALLS__ */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",sys_ni_syscall");
+
 #endif /* _ASM_PPC_UNISTD_H_ */

include/asm-s390/unistd.h

@@ -375,4 +375,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_S390_UNISTD_H_ */

include/asm-s390x/unistd.h

@@ -345,4 +345,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _ASM_S390_UNISTD_H_ */

include/asm-sh/unistd.h

@@ -367,4 +367,12 @@ static __inline__ pid_t wait(int * wait_stat)
 }
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* __ASM_SH_UNISTD_H */

include/asm-sparc/unistd.h

@@ -437,4 +437,12 @@ static __inline__ pid_t wait(int * wait_stat)
 
 #endif /* __KERNEL_SYSCALLS__ */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _SPARC_UNISTD_H */

include/asm-sparc64/unistd.h

@@ -439,4 +439,12 @@ static __inline__ pid_t wait(int * wait_stat)
 #define   _SC_VERSION             8
 #endif
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif /* _SPARC64_UNISTD_H */

include/asm-x86_64/unistd.h

@@ -650,4 +650,12 @@ static inline pid_t wait(int * wait_stat)
 
 #endif /* __NO_STUBS */
 
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
 #endif

kernel/sys.c

@@ -19,6 +19,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <asm/unistd.h>
 
 /*
  * this is where the system-wide overflow UID and GID are defined, for
@@ -174,14 +175,6 @@ asmlinkage long sys_ni_syscall(void)
 	return -ENOSYS;
 }
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on sparc64, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
 cond_syscall(sys_nfsservctl)
 cond_syscall(sys_quotactl)
 cond_syscall(sys_acct)