aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-17 12:04:36 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 14:15:55 -0400
commit6704ab1cd42269e536a6735db740e57e2c04c3b4 (patch)
tree3d57069ffc1904c07fc8d79ee8dd73f07d6f945a /include
parent96d5535870e6a272dcadc300eb9af6ff6c33f6a9 (diff)
x86: hide cond_syscall behind __KERNEL__
This brings x86_64 into line with all other architectures by only defining cond_syscall() when __KERNEL__ is defined. [ tglx: arch/x86 adaptation ] Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/unistd_64.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h
index fc4e73f5f1fa..4f769598abaf 100644
--- a/include/asm-x86/unistd_64.h
+++ b/include/asm-x86/unistd_64.h
@@ -676,6 +676,7 @@ asmlinkage long sys_rt_sigaction(int sig,
676#endif /* __KERNEL__ */ 676#endif /* __KERNEL__ */
677#endif /* __NO_STUBS */ 677#endif /* __NO_STUBS */
678 678
679#ifdef __KERNEL__
679/* 680/*
680 * "Conditional" syscalls 681 * "Conditional" syscalls
681 * 682 *
@@ -683,5 +684,6 @@ asmlinkage long sys_rt_sigaction(int sig,
683 * but it doesn't work on all toolchains, so we just do it by hand 684 * but it doesn't work on all toolchains, so we just do it by hand
684 */ 685 */
685#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") 686#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
687#endif /* __KERNEL__ */
686 688
687#endif /* _ASM_X86_64_UNISTD_H_ */ 689#endif /* _ASM_X86_64_UNISTD_H_ */