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/x86/um/shared/sysdep/faultinfo_32.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/x86/um/shared/sysdep/faultinfo_32.h')
| -rw-r--r-- | arch/x86/um/shared/sysdep/faultinfo_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/shared/sysdep/faultinfo_32.h b/arch/x86/um/shared/sysdep/faultinfo_32.h index ab5c8e47049c..9193a7790a71 100644 --- a/arch/x86/um/shared/sysdep/faultinfo_32.h +++ b/arch/x86/um/shared/sysdep/faultinfo_32.h @@ -31,8 +31,8 @@ struct faultinfo { #define ___backtrack_faulted(_faulted) \ asm volatile ( \ - "mov $0, %0\n" \ "movl $__get_kernel_nofault_faulted_%=,%1\n" \ + "mov $0, %0\n" \ "jmp _end_%=\n" \ "__get_kernel_nofault_faulted_%=:\n" \ "mov $1, %0;" \ |