diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-05 08:14:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-05 08:14:53 -0700 |
| commit | 01f95500a162fca88cefab9ed64ceded5afabc12 (patch) | |
| tree | 3f6feaf0408a604fed9b2e45734a3d7465c58d6e /arch/um/include/asm/uaccess.h | |
| parent | 7b26feb436d2ef5db1e8ba82c7ecb4c1cc869502 (diff) | |
| parent | 68025adfc13e6cd15eebe2293f77659f47daf13b (diff) | |
Merge tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull uml fix from Johannes Berg:
"There's just a single fix here for the _nofault changes that were
causing issues with clang, and then when we looked at it some other
issues seemed to exist"
* tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
um: fix _nofault accesses
Diffstat (limited to 'arch/um/include/asm/uaccess.h')
| -rw-r--r-- | arch/um/include/asm/uaccess.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/asm/uaccess.h b/arch/um/include/asm/uaccess.h index 3a08f9029a3f..1c6e0ae41b0c 100644 --- a/arch/um/include/asm/uaccess.h +++ b/arch/um/include/asm/uaccess.h @@ -55,6 +55,7 @@ do { \ goto err_label; \ } \ *((type *)dst) = get_unaligned((type *)(src)); \ + barrier(); \ current->thread.segv_continue = NULL; \ } while (0) @@ -66,6 +67,7 @@ do { \ if (__faulted) \ goto err_label; \ put_unaligned(*((type *)src), (type *)(dst)); \ + barrier(); \ current->thread.segv_continue = NULL; \ } while (0) |