Skip to content

Commit 7175790

Browse files
davehanseninteltorvalds
authored andcommitted
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: a60f7b6 ("generic syscalls: Wire up memory protection keys syscalls") Signed-off-by: Dave Hansen <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 1001354 commit 7175790

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

include/linux/syscalls.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,5 @@ asmlinkage long sys_pkey_mprotect(unsigned long start, size_t len,
902902
unsigned long prot, int pkey);
903903
asmlinkage long sys_pkey_alloc(unsigned long flags, unsigned long init_val);
904904
asmlinkage long sys_pkey_free(int pkey);
905-
//asmlinkage long sys_pkey_get(int pkey, unsigned long flags);
906-
//asmlinkage long sys_pkey_set(int pkey, unsigned long access_rights,
907-
// unsigned long flags);
908905

909906
#endif

include/uapi/asm-generic/unistd.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -730,10 +730,6 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect)
730730
__SYSCALL(__NR_pkey_alloc, sys_pkey_alloc)
731731
#define __NR_pkey_free 290
732732
__SYSCALL(__NR_pkey_free, sys_pkey_free)
733-
#define __NR_pkey_get 291
734-
//__SYSCALL(__NR_pkey_get, sys_pkey_get)
735-
#define __NR_pkey_set 292
736-
//__SYSCALL(__NR_pkey_set, sys_pkey_set)
737733

738734
#undef __NR_syscalls
739735
#define __NR_syscalls 291

0 commit comments

Comments
 (0)