diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2021-07-13 13:52:51 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-07-16 19:46:45 +0300 |
| commit | e3d18cee258b898017b298b5b93f8134dd62aee3 (patch) | |
| tree | 020739670ea01731b8f5510ecf28de6cac183432 /include | |
| parent | f3e615b4db1fb7034f1d76dc307b77cc848f040e (diff) | |
| download | linux-e3d18cee258b898017b298b5b93f8134dd62aee3.tar.xz | |
locking/atomic: centralize generated headers
The generated atomic headers are only intended to be included directly
by <linux/atomic.h>, but are spread across include/linux/ and
include/asm-generic/, where people mnay be encouraged to include them.
This patch centralizes them under include/linux/atomic/.
Other than the header guards and hashes, there is no change to any of
the generated headers as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210713105253.7615-4-mark.rutland@arm.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/atomic.h | 7 | ||||
| -rw-r--r-- | include/linux/atomic/atomic-arch-fallback.h (renamed from include/linux/atomic-arch-fallback.h) | 0 | ||||
| -rw-r--r-- | include/linux/atomic/atomic-instrumented.h (renamed from include/asm-generic/atomic-instrumented.h) | 8 | ||||
| -rw-r--r-- | include/linux/atomic/atomic-long.h (renamed from include/asm-generic/atomic-long.h) | 8 |
4 files changed, 11 insertions, 12 deletions
diff --git a/include/linux/atomic.h b/include/linux/atomic.h index ed1d3ffd5b9d..1896a58b5aba 100644 --- a/include/linux/atomic.h +++ b/include/linux/atomic.h @@ -77,9 +77,8 @@ __ret; \ }) -#include <linux/atomic-arch-fallback.h> -#include <asm-generic/atomic-instrumented.h> - -#include <asm-generic/atomic-long.h> +#include <linux/atomic/atomic-arch-fallback.h> +#include <linux/atomic/atomic-instrumented.h> +#include <linux/atomic/atomic-long.h> #endif /* _LINUX_ATOMIC_H */ diff --git a/include/linux/atomic-arch-fallback.h b/include/linux/atomic/atomic-arch-fallback.h index a3dba31df01e..a3dba31df01e 100644 --- a/include/linux/atomic-arch-fallback.h +++ b/include/linux/atomic/atomic-arch-fallback.h diff --git a/include/asm-generic/atomic-instrumented.h b/include/linux/atomic/atomic-instrumented.h index bc45af52c93b..f6fe36c428df 100644 --- a/include/asm-generic/atomic-instrumented.h +++ b/include/linux/atomic/atomic-instrumented.h @@ -14,8 +14,8 @@ * arch_ variants (i.e. arch_atomic_read()/arch_atomic_cmpxchg()) to avoid * double instrumentation. */ -#ifndef _ASM_GENERIC_ATOMIC_INSTRUMENTED_H -#define _ASM_GENERIC_ATOMIC_INSTRUMENTED_H +#ifndef _LINUX_ATOMIC_INSTRUMENTED_H +#define _LINUX_ATOMIC_INSTRUMENTED_H #include <linux/build_bug.h> #include <linux/compiler.h> @@ -1333,5 +1333,5 @@ atomic64_dec_if_positive(atomic64_t *v) arch_cmpxchg_double_local(__ai_ptr, __VA_ARGS__); \ }) -#endif /* _ASM_GENERIC_ATOMIC_INSTRUMENTED_H */ -// 1d7c3a25aca5c7fb031c307be4c3d24c7b48fcd5 +#endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ +// 5edd72f105b6f54b7e9492d794abee88e6912d29 diff --git a/include/asm-generic/atomic-long.h b/include/linux/atomic/atomic-long.h index 073cf40f431b..e40e480e175f 100644 --- a/include/asm-generic/atomic-long.h +++ b/include/linux/atomic/atomic-long.h @@ -3,8 +3,8 @@ // Generated by scripts/atomic/gen-atomic-long.sh // DO NOT MODIFY THIS FILE DIRECTLY -#ifndef _ASM_GENERIC_ATOMIC_LONG_H -#define _ASM_GENERIC_ATOMIC_LONG_H +#ifndef _LINUX_ATOMIC_LONG_H +#define _LINUX_ATOMIC_LONG_H #include <linux/compiler.h> #include <asm/types.h> @@ -1010,5 +1010,5 @@ atomic_long_dec_if_positive(atomic_long_t *v) } #endif /* CONFIG_64BIT */ -#endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -// a624200981f552b2c6be4f32fe44da8289f30d87 +#endif /* _LINUX_ATOMIC_LONG_H */ +// c5552b5d78a0c7584dfd03cba985e78a1a86bbed |