Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0adab9b9 authored by Joe Perches's avatar Joe Perches Committed by Paul E. McKenney
Browse files

rcu: Indentation and spacing fixes. 



This commit outdents expression-statement macros, thus repairing a few
line-length complaints.  Also fix some spacing errors called out by
checkpatch.pl.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 41f4abd9

include/linux/rculist.h

+9 −8
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static inline void list_splice_init_rcu(struct list_head *list, 
 * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock().

 */

#define list_entry_rcu(ptr, type, member) \

	({typeof (*ptr) __rcu *__ptr = (typeof (*ptr) __rcu __force *)ptr; \

({ \

	typeof(*ptr) __rcu *__ptr = (typeof(*ptr) __rcu __force *)ptr; \

	container_of((typeof(ptr))rcu_dereference_raw(__ptr), type, member); \

})
@@ -285,10 +286,10 @@ static inline void list_splice_init_rcu(struct list_head *list, 
 * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock().

 */

#define list_first_or_null_rcu(ptr, type, member) \

	({struct list_head *__ptr = (ptr); \

({ \

	struct list_head *__ptr = (ptr); \

	struct list_head *__next = ACCESS_ONCE(__ptr->next); \

	  likely(__ptr != __next) ? \

		list_entry_rcu(__next, type, member) : NULL; \

	likely(__ptr != __next) ? list_entry_rcu(__next, type, member) : NULL; \

})



/**

include/linux/rcupdate.h

+29 −29
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static inline void rcu_preempt_sleep_check(void) 
	typeof(*p) *_________p1 = (typeof(*p) *__force)ACCESS_ONCE(p); \

	rcu_lockdep_assert(c, "suspicious rcu_dereference_check() usage"); \

	rcu_dereference_sparse(p, space); \

		smp_read_barrier_depends(); \

	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \

	((typeof(*p) __force __kernel *)(_________p1)); \

})

#define __rcu_dereference_protected(p, c, space) \
@@ -539,7 +539,7 @@ static inline void rcu_preempt_sleep_check(void) 
	typeof(p) _________p1 = ACCESS_ONCE(p); \

	rcu_lockdep_assert(c, \

			   "suspicious rcu_dereference_index_check() usage"); \

		smp_read_barrier_depends(); \

	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \

	(_________p1); \

})