Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

compiler.h: Remove ACCESS_ONCE()

There are no longer any kernelspace uses of ACCESS_ONCE(), so we can
remove the definition from <linux/compiler.h>.

This patch removes the ACCESS_ONCE() definition, and updates comments
which referred to it. At the same time, some inconsistent and redundant
whitespace is removed from comments.

Tested-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: apw@canonical.com
Link: http://lkml.kernel.org/r/20171127103824.36526-4-mark.rutland@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Mark Rutland and committed by
Ingo Molnar
b899a850 2a22f692

+11 -36
+11 -36
include/linux/compiler.h
··· 220 220 /* 221 221 * Prevent the compiler from merging or refetching reads or writes. The 222 222 * compiler is also forbidden from reordering successive instances of 223 - * READ_ONCE, WRITE_ONCE and ACCESS_ONCE (see below), but only when the 224 - * compiler is aware of some particular ordering. One way to make the 225 - * compiler aware of ordering is to put the two invocations of READ_ONCE, 226 - * WRITE_ONCE or ACCESS_ONCE() in different C statements. 223 + * READ_ONCE and WRITE_ONCE, but only when the compiler is aware of some 224 + * particular ordering. One way to make the compiler aware of ordering is to 225 + * put the two invocations of READ_ONCE or WRITE_ONCE in different C 226 + * statements. 227 227 * 228 - * In contrast to ACCESS_ONCE these two macros will also work on aggregate 229 - * data types like structs or unions. If the size of the accessed data 230 - * type exceeds the word size of the machine (e.g., 32 bits or 64 bits) 231 - * READ_ONCE() and WRITE_ONCE() will fall back to memcpy(). There's at 232 - * least two memcpy()s: one for the __builtin_memcpy() and then one for 233 - * the macro doing the copy of variable - '__u' allocated on the stack. 228 + * These two macros will also work on aggregate data types like structs or 229 + * unions. If the size of the accessed data type exceeds the word size of 230 + * the machine (e.g., 32 bits or 64 bits) READ_ONCE() and WRITE_ONCE() will 231 + * fall back to memcpy(). There's at least two memcpy()s: one for the 232 + * __builtin_memcpy() and then one for the macro doing the copy of variable 233 + * - '__u' allocated on the stack. 234 234 * 235 235 * Their two major use cases are: (1) Mediating communication between 236 236 * process-level code and irq/NMI handlers, all running on the same CPU, 237 - * and (2) Ensuring that the compiler does not fold, spindle, or otherwise 237 + * and (2) Ensuring that the compiler does not fold, spindle, or otherwise 238 238 * mutilate accesses that either do not require ordering or that interact 239 239 * with an explicit memory barrier or atomic instruction that provides the 240 240 * required ordering. ··· 326 326 #define compiletime_assert_atomic_type(t) \ 327 327 compiletime_assert(__native_word(t), \ 328 328 "Need native word sized stores/loads for atomicity.") 329 - 330 - /* 331 - * Prevent the compiler from merging or refetching accesses. The compiler 332 - * is also forbidden from reordering successive instances of ACCESS_ONCE(), 333 - * but only when the compiler is aware of some particular ordering. One way 334 - * to make the compiler aware of ordering is to put the two invocations of 335 - * ACCESS_ONCE() in different C statements. 336 - * 337 - * ACCESS_ONCE will only work on scalar types. For union types, ACCESS_ONCE 338 - * on a union member will work as long as the size of the member matches the 339 - * size of the union and the size is smaller than word size. 340 - * 341 - * The major use cases of ACCESS_ONCE used to be (1) Mediating communication 342 - * between process-level code and irq/NMI handlers, all running on the same CPU, 343 - * and (2) Ensuring that the compiler does not fold, spindle, or otherwise 344 - * mutilate accesses that either do not require ordering or that interact 345 - * with an explicit memory barrier or atomic instruction that provides the 346 - * required ordering. 347 - * 348 - * If possible use READ_ONCE()/WRITE_ONCE() instead. 349 - */ 350 - #define __ACCESS_ONCE(x) ({ \ 351 - __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \ 352 - (volatile typeof(x) *)&(x); }) 353 - #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) 354 329 355 330 #endif /* __LINUX_COMPILER_H */