From: Ira Weiny <[email protected]>
arch_set_user_pkey_access() was declared two times in the header.
Remove the 2nd declaration.
Suggested-by: "Edgecombe, Rick P" <[email protected]>
Signed-off-by: Ira Weiny <[email protected]>
---
This is a resend of a patch[1] which was originally part of a larger clean up
series. Dave asked that the type clean up be reworked but the first 2 patches
are separate from that work and should stand on their own.
Resending this patch for inclusion on it's own.
[1] https://lore.kernel.org/lkml/[email protected]/
---
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 1d5f14aff5f6..9c530530b9a7 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);
--
2.35.1
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 <[email protected]>
AuthorDate: Thu, 31 Mar 2022 11:05:54 -07:00
Committer: Dave Hansen <[email protected]>
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" <[email protected]>
Signed-off-by: Ira Weiny <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
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);