Merge branch 'next' into for-linus

Prepare first set of updates for 3.11 merge window.

1 files changed, 16 insertions, 0 deletions

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 807f1e533226..d3e8ad23a8e0 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -2,6 +2,8 @@
 #define _LINUX_LINKAGE_H
 
 #include <linux/compiler.h>
+#include <linux/stringify.h>
+#include <linux/export.h>
 #include <asm/linkage.h>
 
 #ifdef __cplusplus
@@ -14,6 +16,20 @@
 #define asmlinkage CPP_ASMLINKAGE
 #endif
 
+#ifndef cond_syscall
+#define cond_syscall(x) asm(                            \
+        ".weak " VMLINUX_SYMBOL_STR(x) "\n\t"           \
+        ".set  " VMLINUX_SYMBOL_STR(x) ","              \
+                 VMLINUX_SYMBOL_STR(sys_ni_syscall))
+#endif
+
+#ifndef SYSCALL_ALIAS
+#define SYSCALL_ALIAS(alias, name) asm(                 \
+        ".globl " VMLINUX_SYMBOL_STR(alias) "\n\t"      \
+        ".set   " VMLINUX_SYMBOL_STR(alias) ","         \
+                  VMLINUX_SYMBOL_STR(name))
+#endif
+
 #define __page_aligned_data     __section(.data..page_aligned) __aligned(PAGE_SIZE)
 #define __page_aligned_bss      __section(.bss..page_aligned) __aligned(PAGE_SIZE)