The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 70431c63d7ed31baf18b0083ba5473274363a174 Gitweb: https://git.kernel.org/tip/70431c63d7ed31baf18b0083ba5473274363a174 Author: Ira Weiny <ira.weiny@xxxxxxxxx> AuthorDate: Thu, 31 Mar 2022 11:05:54 -07:00 Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> CommitterDate: Mon, 04 Apr 2022 15:58:24 -07:00 x86/pkeys: Clean up arch_set_user_pkey_access() declaration arch_set_user_pkey_access() was declared two times in the header. Remove the 2nd declaration. Suggested-by: "Edgecombe, Rick P" <rick.p.edgecombe@xxxxxxxxx> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx> Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20220331180554.2945884-1-ira.weiny@xxxxxxxxx --- arch/x86/include/asm/pkeys.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h index 1d5f14a..9c53053 100644 --- a/arch/x86/include/asm/pkeys.h +++ b/arch/x86/include/asm/pkeys.h @@ -118,8 +118,6 @@ int mm_pkey_free(struct mm_struct *mm, int pkey) return 0; } -extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, - unsigned long init_val); extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long init_val);
|