From: Valdis.Kletnieks@vt.edu This causes a compile issue: CC security/keys/keyctl.o security/keys/keyctl.c:1029: error: conflicting types for 'keyctl_assume_authority' security/keys/internal.h:141: error: previous declaration of 'keyctl_assume_authority' was here make[2]: *** [security/keys/keyctl.o] Error 1 Why does keyctl.c declare it as 'asmlinkage'? Cc: David Howells Signed-off-by: Andrew Morton --- security/keys/keyctl.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN security/keys/keyctl.c~keys-permit-running-process-to-instantiate-keys-warning-fix security/keys/keyctl.c --- 25/security/keys/keyctl.c~keys-permit-running-process-to-instantiate-keys-warning-fix Thu Nov 17 13:49:04 2005 +++ 25-akpm/security/keys/keyctl.c Thu Nov 17 13:49:04 2005 @@ -1025,7 +1025,7 @@ error: /* * assume the authority to instantiate the specified key */ -asmlinkage long keyctl_assume_authority(key_serial_t id) +long keyctl_assume_authority(key_serial_t id) { struct key *authkey; long ret; _