summaryrefslogtreecommitdiff
path: root/arch/um/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-06 12:04:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-06 12:04:26 +0300
commita681e6559ce6fe8ca56333f7041d0a0d38aaee94 (patch)
tree8f369aaa68139cf75a444ac404bae12e52c4ea80 /arch/um/include
parent53c2f13c1ee59c8889bf23ef58653677e3ec1644 (diff)
parent7b59ab988c01c190f1b528cf750d6f33b738d1e2 (diff)
downloadlinux-a681e6559ce6fe8ca56333f7041d0a0d38aaee94.tar.xz
Merge v6.15.5
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r--arch/um/include/asm/asm-prototypes.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/um/include/asm/asm-prototypes.h b/arch/um/include/asm/asm-prototypes.h
index 5898a26daa0d..408b31d59127 100644
--- a/arch/um/include/asm/asm-prototypes.h
+++ b/arch/um/include/asm/asm-prototypes.h
@@ -1 +1,6 @@
#include <asm-generic/asm-prototypes.h>
+#include <asm/checksum.h>
+
+#ifdef CONFIG_UML_X86
+extern void cmpxchg8b_emu(void);
+#endif