Commit e3d18cee authored by Mark Rutland's avatar Mark Rutland Committed by Peter Zijlstra
Browse files

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: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210713105253.7615-4-mark.rutland@arm.com
parent f3e615b4

include/linux/atomic.h

+3 −4
Original line number Diff line number Diff line
@@ -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 */

include/asm-generic/atomic-instrumented.h→include/linux/atomic/atomic-instrumented.h

+4 −4
Original line number Diff line number Diff line
@@ -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

include/asm-generic/atomic-long.h→include/linux/atomic/atomic-long.h

+4 −4
Original line number Diff line number Diff line
@@ -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

scripts/atomic/check-atomics.sh

+3 −3
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ if [ $? -ne 0 ]; then 
fi



cat <<EOF |

asm-generic/atomic-instrumented.h

asm-generic/atomic-long.h

linux/atomic-arch-fallback.h

linux/atomic/atomic-instrumented.h

linux/atomic/atomic-long.h

linux/atomic/atomic-arch-fallback.h

EOF

while read header; do

	OLDSUM="$(tail -n 1 ${LINUXDIR}/include/${header})"