Re: 2.6.15-rc1-mm1

[Valdis . Kletnieks]

On Thu, 17 Nov 2005 11:18:07 PST, Andrew Morton said:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.15-rc1/2.6.15-rc1-mm1

> +keys-permit-running-process-to-instantiate-keys.patch
> 
>  key management updates

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'?

--- linux-2.6.15-rc1-mm1/security/keys/keyctl.c.dist	2005-11-17 15:59:04.000000000 -0500
+++ linux-2.6.15-rc1-mm1/security/keys/keyctl.c	2005-11-17 16:28:05.000000000 -0500
@@ -1025,7 +1025,7 @@
 /*
  * 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;

Attachment: pgp00000.pgp
Description: PGP signature