Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6704ab1cd42269e536a6735db740e57e2c04c3b4
Commit:     6704ab1cd42269e536a6735db740e57e2c04c3b4
Parent:     96d5535870e6a272dcadc300eb9af6ff6c33f6a9
Author:     Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 18:04:36 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:15:55 2007 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 include/asm-x86/unistd_64.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h
index fc4e73f..4f76959 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,
 #endif /* __KERNEL__ */
 #endif /* __NO_STUBS */
 
+#ifdef __KERNEL__
 /*
  * "Conditional" syscalls
  *
@@ -683,5 +684,6 @@ asmlinkage long sys_rt_sigaction(int sig,
  * 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__ */
 
 #endif /* _ASM_X86_64_UNISTD_H_ */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to