From: Ira Weiny <[email protected]>
In the x86 code __arch_set_user_pkey_access() is not used and is not
defined.
Remove the dead declaration.
To: Dave Hansen <[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]/
Changes from V1:
Make this part of a series of pkey clean ups
---
arch/x86/include/asm/pkeys.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h
index 9c530530b9a7..2e6c04d8a45b 100644
--- a/arch/x86/include/asm/pkeys.h
+++ b/arch/x86/include/asm/pkeys.h
@@ -41,9 +41,6 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
return __arch_override_mprotect_pkey(vma, prot, pkey);
}
-extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
- unsigned long init_val);
-
#define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | VM_PKEY_BIT3)
#define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map)
@@ -118,9 +115,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);
-
static inline int vma_pkey(struct vm_area_struct *vma)
{
unsigned long vma_pkey_mask = VM_PKEY_BIT0 | VM_PKEY_BIT1 |
--
2.35.1
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 5a0893088a20252cc268cbeabb25e883c2b6f94f
Gitweb: https://git.kernel.org/tip/5a0893088a20252cc268cbeabb25e883c2b6f94f
Author: Ira Weiny <[email protected]>
AuthorDate: Thu, 31 Mar 2022 11:06:55 -07:00
Committer: Dave Hansen <[email protected]>
CommitterDate: Mon, 04 Apr 2022 15:58:24 -07:00
x86/pkeys: Remove __arch_set_user_pkey_access() declaration
In the x86 code __arch_set_user_pkey_access() is not used and is not
defined.
Remove the dead declaration.
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 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h
index 9c53053..2e6c04d 100644
--- a/arch/x86/include/asm/pkeys.h
+++ b/arch/x86/include/asm/pkeys.h
@@ -41,9 +41,6 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
return __arch_override_mprotect_pkey(vma, prot, pkey);
}
-extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
- unsigned long init_val);
-
#define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | VM_PKEY_BIT3)
#define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map)
@@ -118,9 +115,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);
-
static inline int vma_pkey(struct vm_area_struct *vma)
{
unsigned long vma_pkey_mask = VM_PKEY_BIT0 | VM_PKEY_BIT1 |