From 52b63d2bd47ac9fc787c68ae7658d0534a474806 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Date: Mon, 2 Feb 2009 21:48:33 +0530
Subject: [PATCH] --- yaml --- r: 135836 b: refs/heads/master c:
 8d4b4981195849dd50ed94be33ede926c6f41dcd h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/prctl.h    | 4 ----
 trunk/arch/x86/include/asm/syscalls.h | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 23008db05aae..dbabf1107f37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11d9f653aff1d445b4300ae1d2e2d675a0e9172f
+refs/heads/master: 8d4b4981195849dd50ed94be33ede926c6f41dcd
diff --git a/trunk/arch/x86/include/asm/prctl.h b/trunk/arch/x86/include/asm/prctl.h
index a8894647dd9a..3ac5032fae09 100644
--- a/trunk/arch/x86/include/asm/prctl.h
+++ b/trunk/arch/x86/include/asm/prctl.h
@@ -6,8 +6,4 @@
 #define ARCH_GET_FS 0x1003
 #define ARCH_GET_GS 0x1004
 
-#ifdef CONFIG_X86_64
-extern long sys_arch_prctl(int, unsigned long);
-#endif /* CONFIG_X86_64 */
-
 #endif /* _ASM_X86_PRCTL_H */
diff --git a/trunk/arch/x86/include/asm/syscalls.h b/trunk/arch/x86/include/asm/syscalls.h
index c0b0bda754ee..e26d34b0bc79 100644
--- a/trunk/arch/x86/include/asm/syscalls.h
+++ b/trunk/arch/x86/include/asm/syscalls.h
@@ -74,6 +74,7 @@ asmlinkage long sys_vfork(struct pt_regs *);
 asmlinkage long sys_execve(char __user *, char __user * __user *,
 			   char __user * __user *,
 			   struct pt_regs *);
+long sys_arch_prctl(int, unsigned long);
 
 /* kernel/ioport.c */
 asmlinkage long sys_iopl(unsigned int, struct pt_regs *);