Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S269048AbUIHJbY (ORCPT ); Wed, 8 Sep 2004 05:31:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S269065AbUIHJbY (ORCPT ); Wed, 8 Sep 2004 05:31:24 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55170 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S269048AbUIHJbR (ORCPT ); Wed, 8 Sep 2004 05:31:17 -0400 From: David Howells In-Reply-To: <20040908014735.7a2058dc.akpm@osdl.org> References: <20040908014735.7a2058dc.akpm@osdl.org> <20040907020831.62390588.akpm@osdl.org> To: Andrew Morton Cc: Simon Derr , linux-kernel@vger.kernel.org Subject: [PATCH] Remove syscall declarations from linux/key.h User-Agent: EMH/1.14.1 SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/21.3 (i386-redhat-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII Date: Wed, 08 Sep 2004 10:30:31 +0100 Message-ID: <1070.1094635831@redhat.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1876 Lines: 49 The attached patch removes the syscall declarations from linux/key.h as they're not really necessary - only entry.S should be calling them. Signed-Off-By: David Howells --- key.h | 17 ----------------- 1 files changed, 17 deletions(-) diff -c /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h.orig /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h --- /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h.orig 2004-09-08 10:15:43.472375403 +0100 +++ /warthog/kernels/linux-2.6.9-rc1-mm4-afs/include/linux/key.h 2004-09-08 10:15:56.636285384 +0100 @@ -251,20 +251,6 @@ extern void key_fsuid_changed(struct task_struct *tsk); extern void key_fsgid_changed(struct task_struct *tsk); -asmlinkage long sys_add_key(const char __user *_type, - const char __user *_description, - const void __user *_payload, - size_t plen, - key_serial_t destringid); - -asmlinkage long sys_request_key(const char __user *_type, - const char __user *_description, - const char __user *_callout_info, - key_serial_t destringid); - -asmlinkage long sys_keyctl(int cmd, unsigned long arg2, unsigned long arg3, - unsigned long arg4, unsigned long arg5); - #else /* CONFIG_KEYS */ #define key_put(k) do { } while(0) @@ -276,9 +262,6 @@ #define exec_keys(t) do { } while(0) #define key_fsuid_changed(t) do { } while(0) #define key_fsgid_changed(t) do { } while(0) -#define sys_addkey(a,b,c,d,e) (-ENOSYS) -#define sys_request_key(a,b,c,d,e) (-ENOSYS) -#define sys_keyctl(a,b,c,d,e) (-ENOSYS) #endif /* CONFIG_KEYS */ #endif /* __KERNEL__ */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/