path: root/arch/s390/include
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-06 13:36:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-06 13:36:31 -0800
commit43a2898631a8beee66c1d64c1e860f43d96b2e91 (patch)
treefc2a43ca77627443d09621bdb1e364e41b4f3890 /arch/s390/include
parentf89d416a8676fe36de8be0f7c2e1ac6cd51410a8 (diff)
parent4f4afc2c9599520300b3f2b3666d2034fca03df3 (diff)
Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull more powerpc updates from Michael Ellerman: "A few commits splitting the KASAN instrumented bitops header in three, to match the split of the asm-generic bitops headers. This is needed on powerpc because we use the generic bitops for the non-atomic case only, whereas the existing KASAN instrumented bitops assume all the underlying operations are provided by the arch as arch_foo() versions. Thanks to: Daniel Axtens & Christophe Leroy" * tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: docs/core-api: Remove possibly confusing sub-headings from Bit Operations powerpc: support KASAN instrumentation of bitops kasan: support instrumented bitops combined with generic bitops
Diffstat (limited to 'arch/s390/include')
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index eb7eed43e780..431e208a5ea4 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -241,7 +241,9 @@ static inline void arch___clear_bit_unlock(unsigned long nr,
arch___clear_bit(nr, ptr);
-#include <asm-generic/bitops-instrumented.h>
+#include <asm-generic/bitops/instrumented-atomic.h>
+#include <asm-generic/bitops/instrumented-non-atomic.h>
+#include <asm-generic/bitops/instrumented-lock.h>
* Functions which use MSB0 bit numbering.

Privacy Policy