[Yakkety SRU] Fix regression in linux-libc-dev on Arm builds

[Stefan Bader]

On 27.01.2017 09:38, Stefan Bader wrote:
> A set of patches backported into Yakkety contained one accidentally
> adding C++ style comments. This was fixed before v4.9 upstream release
> by the following patch.

Needs one more ack and should really go into the next cycle.

> 
> -Stefan
> 
> ---
> From 71757904efadefdf5505712f675218ce59483c5d Mon Sep 17 00:00:00 2001
> From: Dave Hansen <dave.hansen at intel.com>
> Date: Mon, 17 Oct 2016 08:18:15 -0700
> Subject: [PATCH] generic syscalls: kill cruft from removed pkey syscalls
> 
> pkey_set() and pkey_get() were syscalls present in older versions
> of the protection keys patches.  They were fully excised from the
> x86 code, but some cruft was left in the generic syscall code.  The
> C++ comments were intended to help to make it more glaring to me to
> fix them before actually submitting them.  That technique worked,
> but later than I would have liked.
> 
> I test-compiled this for arm64.
> 
> Fixes: a60f7b69d92c0 ("generic syscalls: Wire up memory protection keys syscalls")
> Signed-off-by: Dave Hansen <dave.hansen at linux.intel.com>
> Acked-by: Arnd Bergmann <arnd at arndb.de>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: x86 at kernel.org
> Cc: linux-arch at vger.kernel.org
> Cc: mgorman at techsingularity.net
> Cc: linux-api at vger.kernel.org
> Cc: linux-mm at kvack.org
> Cc: luto at kernel.org
> Cc: akpm at linux-foundation.org
> Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
> 
> BugLink: http://bugs.launchpad.net/bugs/1659654
> 
> (cherry-picked from commit 71757904efadefdf5505712f675218ce59483c5d upstream)
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> 
> ---
>  include/linux/syscalls.h          | 3 ---
>  include/uapi/asm-generic/unistd.h | 4 ----
>  2 files changed, 7 deletions(-)
> 
> diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
> index 0d7abb8..91a740f 100644
> --- a/include/linux/syscalls.h
> +++ b/include/linux/syscalls.h
> @@ -902,8 +902,5 @@ asmlinkage long sys_pkey_mprotect(unsigned long start, size_t len,
>  				  unsigned long prot, int pkey);
>  asmlinkage long sys_pkey_alloc(unsigned long flags, unsigned long init_val);
>  asmlinkage long sys_pkey_free(int pkey);
> -//asmlinkage long sys_pkey_get(int pkey, unsigned long flags);
> -//asmlinkage long sys_pkey_set(int pkey, unsigned long access_rights,
> -//			     unsigned long flags);
>  
>  #endif
> diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
> index dbfee7e..9b1462e 100644
> --- a/include/uapi/asm-generic/unistd.h
> +++ b/include/uapi/asm-generic/unistd.h
> @@ -730,10 +730,6 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect)
>  __SYSCALL(__NR_pkey_alloc,    sys_pkey_alloc)
>  #define __NR_pkey_free 290
>  __SYSCALL(__NR_pkey_free,     sys_pkey_free)
> -#define __NR_pkey_get 291
> -//__SYSCALL(__NR_pkey_get,      sys_pkey_get)
> -#define __NR_pkey_set 292
> -//__SYSCALL(__NR_pkey_set,      sys_pkey_set)
>  
>  #undef __NR_syscalls
>  #define __NR_syscalls 291
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20170131/83d10189/attachment.sig>