The patch titled
Subject: uaccess-add-force_uaccess_beginend-helpers-v2
has been removed from the -mm tree. Its filename was
uaccess-add-force_uaccess_beginend-helpers-v2.patch
This patch was dropped because it was folded into uaccess-add-force_uaccess_beginend-helpers.patch
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: uaccess-add-force_uaccess_beginend-helpers-v2
drop two incorrect hunks, fix a commit log typo
Link: http://lkml.kernel.org/r/20200714105505.935079-6-hch@xxxxxx
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Acked-by: Greentime Hu <green.hu@xxxxxxxxx>
Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/m68k/include/asm/tlbflush.h | 6 +++---
arch/sh/kernel/traps_32.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- a/arch/m68k/include/asm/tlbflush.h~uaccess-add-force_uaccess_beginend-helpers-v2
+++ a/arch/m68k/include/asm/tlbflush.h
@@ -13,13 +13,13 @@ static inline void flush_tlb_kernel_page
if (CPU_IS_COLDFIRE) {
mmu_write(MMUOR, MMUOR_CNL);
} else if (CPU_IS_040_OR_060) {
- mm_segment_t old_fs = force_uaccess_begin();
-
+ mm_segment_t old_fs = get_fs();
+ set_fs(KERNEL_DS);
__asm__ __volatile__(".chip 68040\n\t"
"pflush (%0)\n\t"
".chip 68k"
: : "a" (addr));
- force_uaccess_end(old_fs);
+ set_fs(old_fs);
} else if (CPU_IS_020_OR_030)
__asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
}
--- a/arch/sh/kernel/traps_32.c~uaccess-add-force_uaccess_beginend-helpers-v2
+++ a/arch/sh/kernel/traps_32.c
@@ -538,13 +538,13 @@ uspace_segv:
if (regs->pc & 1)
die("unaligned program counter", regs, error_code);
- oldfs = force_uaccess_begin();
+ set_fs(KERNEL_DS);
if (copy_from_user(&instruction, (void __user *)(regs->pc),
sizeof(instruction))) {
/* Argh. Fault on the instruction itself.
This should never happen non-SMP
*/
- force_uaccess_end(oldfs);
+ set_fs(oldfs);
die("insn faulting in do_address_error", regs, 0);
}
@@ -552,7 +552,7 @@ uspace_segv:
handle_unaligned_access(instruction, regs, &user_mem_access,
0, address);
- force_uaccess_end(oldfs);
+ set_fs(oldfs);
}
}
_
Patches currently in -mm which might be from hch@xxxxxx are
syscalls-use-uaccess_kernel-in-addr_limit_user_check.patch
nds32-use-uaccess_kernel-in-show_regs.patch
riscv-include-asm-pgtableh-in-asm-uaccessh.patch
uaccess-remove-segment_eq.patch
uaccess-add-force_uaccess_beginend-helpers.patch
exec-use-force_uaccess_begin-during-exec-and-exit.patch
kernel-add-a-kernel_wait-helper.patch
