diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-11-02 15:53:54 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-11-02 15:54:58 +0000 |
| commit | 05f3647359f8bf44e000122cee6a848f5129e2e3 (patch) | |
| tree | 072631bead382da3152ffa5b7c5767f683ddca16 /arch/x86/mm/pkeys.c | |
| parent | 7bdeb7f52b1b193bb50fc6d01c6110ba50bafb5b (diff) | |
| parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) | |
Merge tag 'v4.14-rc3' into irq/irqchip-4.15
Required merge to get mainline irqchip updates.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/x86/mm/pkeys.c')
| -rw-r--r-- | arch/x86/mm/pkeys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c index 2dab69a706ec..d7bc0eea20a5 100644 --- a/arch/x86/mm/pkeys.c +++ b/arch/x86/mm/pkeys.c @@ -18,7 +18,6 @@ #include <asm/cpufeature.h> /* boot_cpu_has, ... */ #include <asm/mmu_context.h> /* vma_pkey() */ -#include <asm/fpu/internal.h> /* fpregs_active() */ int __execute_only_pkey(struct mm_struct *mm) { @@ -45,7 +44,7 @@ int __execute_only_pkey(struct mm_struct *mm) */ preempt_disable(); if (!need_to_set_mm_pkey && - fpregs_active() && + current->thread.fpu.initialized && !__pkru_allows_read(read_pkru(), execute_only_pkey)) { preempt_enable(); return execute_only_pkey; |