Fix up "compat_sys_keyctl()" system call.

Fix name, and make sure that it's listed as a conditional
system call so that we stub it out to ENOSYS if the kernel
isn't compiled with key management support.

arch/ppc64/kernel/misc.S

@@ -965,7 +965,7 @@ _GLOBAL(sys_call_table32)
 	.llong .sys_ni_syscall		/* 268 reserved for sys_kexec_load */
 	.llong .sys32_add_key
 	.llong .sys32_request_key
-	.llong .compat_keyctl
+	.llong .compat_sys_keyctl
 
 	.balign 8
 _GLOBAL(sys_call_table)

include/linux/compat.h

@@ -119,7 +119,7 @@ long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
 long compat_sys_shmctl(int first, int second, void __user *uptr);
 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
 		unsigned nsems, const struct compat_timespec __user *timeout);
-asmlinkage long compat_keyctl(u32 option,
+asmlinkage long compat_sys_keyctl(u32 option,
 			      u32 arg2, u32 arg3, u32 arg4, u32 arg5);
 
 asmlinkage ssize_t compat_sys_readv(unsigned long fd,

kernel/sys.c

@@ -286,6 +286,7 @@ cond_syscall(compat_set_mempolicy)
 cond_syscall(sys_add_key)
 cond_syscall(sys_request_key)
 cond_syscall(sys_keyctl)
+cond_syscall(compat_sys_keyctl)
 cond_syscall(compat_sys_socketcall)
 
 /* arch-specific weak syscall entries */

security/keys/compat.c

@@ -23,7 +23,7 @@
  *   registers on taking a 32-bit syscall are zero
  * - if you can, you should call sys_keyctl directly
  */
-asmlinkage long compat_keyctl(u32 option,
+asmlinkage long compat_sys_keyctl(u32 option,
 			      u32 arg2, u32 arg3, u32 arg4, u32 arg5)
 {
 	switch (option) {
@@ -75,4 +75,4 @@ asmlinkage long compat_keyctl(u32 option,
 		return -EOPNOTSUPP;
 	}
 
-} /* end compat_keyctl() */
+} /* end compat_sys_keyctl() */