summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/unistd.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-05-04 18:34:13 -0700
committerDavid S. Miller <davem@davemloft.net>2013-05-04 18:34:13 -0700
commit048c9acca90ca7da42b92745445fe008a48add88 (patch)
treee2e551a565a7dcdca0fc398aa659231745e5a901 /arch/s390/include/asm/unistd.h
parent07df841877195765d958df146f614fc7bdedd5e3 (diff)
parentad348cc5349be4ef4abe08819afbb63386585413 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Merge sparc bug fixes that didn't make it into v3.9 into sparc-next. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/include/asm/unistd.h')
-rw-r--r--arch/s390/include/asm/unistd.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index a6667a95296..65188635355 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -54,12 +54,4 @@
#define __ARCH_WANT_SYS_VFORK
#define __ARCH_WANT_SYS_CLONE
-/*
- * "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_ */