From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: mingo@kernel.org, stern@rowland.harvard.edu,
parri.andrea@gmail.com, will.deacon@arm.com,
peterz@infradead.org, boqun.feng@gmail.com, npiggin@gmail.com,
dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr,
akiyks@gmail.com,
Andrea Parri <andrea.parri@amarulasolutions.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH tools/memory-model 17/17] tools/memory-model: Fix coding style in 'linux-kernel.def'
Date: Mon, 16 Apr 2018 09:12:45 -0700 [thread overview]
Message-ID: <1523895165-17576-17-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180416161209.GA6895@linux.vnet.ibm.com>
From: Andrea Parri <andrea.parri@amarulasolutions.com>
This commit fixes white spaces around semicolons.
Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
tools/memory-model/linux-kernel.def | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/memory-model/linux-kernel.def b/tools/memory-model/linux-kernel.def
index acf86f6f360a..6bd3bc431b3d 100644
--- a/tools/memory-model/linux-kernel.def
+++ b/tools/memory-model/linux-kernel.def
@@ -17,12 +17,12 @@ rcu_dereference(X) __load{once}(X)
smp_store_mb(X,V) { __store{once}(X,V); __fence{mb}; }
// Fences
-smp_mb() { __fence{mb} ; }
-smp_rmb() { __fence{rmb} ; }
-smp_wmb() { __fence{wmb} ; }
-smp_mb__before_atomic() { __fence{before-atomic} ; }
-smp_mb__after_atomic() { __fence{after-atomic} ; }
-smp_mb__after_spinlock() { __fence{after-spinlock} ; }
+smp_mb() { __fence{mb}; }
+smp_rmb() { __fence{rmb}; }
+smp_wmb() { __fence{wmb}; }
+smp_mb__before_atomic() { __fence{before-atomic}; }
+smp_mb__after_atomic() { __fence{after-atomic}; }
+smp_mb__after_spinlock() { __fence{after-spinlock}; }
// Exchange
xchg(X,V) __xchg{mb}(X,V)
@@ -35,26 +35,26 @@ cmpxchg_acquire(X,V,W) __cmpxchg{acquire}(X,V,W)
cmpxchg_release(X,V,W) __cmpxchg{release}(X,V,W)
// Spinlocks
-spin_lock(X) { __lock(X) ; }
-spin_unlock(X) { __unlock(X) ; }
+spin_lock(X) { __lock(X); }
+spin_unlock(X) { __unlock(X); }
spin_trylock(X) __trylock(X)
// RCU
rcu_read_lock() { __fence{rcu-lock}; }
-rcu_read_unlock() { __fence{rcu-unlock};}
+rcu_read_unlock() { __fence{rcu-unlock}; }
synchronize_rcu() { __fence{sync-rcu}; }
synchronize_rcu_expedited() { __fence{sync-rcu}; }
// Atomic
atomic_read(X) READ_ONCE(*X)
-atomic_set(X,V) { WRITE_ONCE(*X,V) ; }
+atomic_set(X,V) { WRITE_ONCE(*X,V); }
atomic_read_acquire(X) smp_load_acquire(X)
atomic_set_release(X,V) { smp_store_release(X,V); }
-atomic_add(V,X) { __atomic_op(X,+,V) ; }
-atomic_sub(V,X) { __atomic_op(X,-,V) ; }
-atomic_inc(X) { __atomic_op(X,+,1) ; }
-atomic_dec(X) { __atomic_op(X,-,1) ; }
+atomic_add(V,X) { __atomic_op(X,+,V); }
+atomic_sub(V,X) { __atomic_op(X,-,V); }
+atomic_inc(X) { __atomic_op(X,+,1); }
+atomic_dec(X) { __atomic_op(X,-,1); }
atomic_add_return(V,X) __atomic_op_return{mb}(X,+,V)
atomic_add_return_relaxed(V,X) __atomic_op_return{once}(X,+,V)
--
2.5.2
next prev parent reply other threads:[~2018-04-16 16:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-16 16:12 [PATCH tools/memory-model 0/17] Memory-model changes Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 01/17] tools/memory-model: Rename link and rcu-path to rcu-link and rb Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 02/17] tools/memory-model: Redefine rb in terms of rcu-fence Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 03/17] docs/memory-barriers.txt: Fix broken DMA vs MMIO ordering example Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 04/17] locking: Document the semantics of spin_is_locked() Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 05/17] arm64: Remove smp_mb() from arch_spin_is_locked() Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 06/17] locking: Clean up comment and #ifndef for {,queued_}spin_is_locked() Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 07/17] kokr/doc: READ_ONCE() now implies smp_barrier_depends() Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 08/17] kokr/doc: De-emphasize smp_read_barrier_depends Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 09/17] kokr/Documentation/memory-barriers.txt: Cross-reference "tools/memory-model/" Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 10/17] kokr/memory-barriers: Fix description of data dependency barriers Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 11/17] kokr/locking/memory-barriers: De-emphasize smp_read_barrier_depends() some more Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 12/17] tools/memory-model: Update required version of herdtools7 Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 13/17] memory-model: Fix cheat sheet typo Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 14/17] tools/memory-order: Improve key for SELF and SV Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 15/17] tools/memory-order: smp_mb__after_atomic() orders later RMW operations Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` [PATCH tools/memory-model 16/17] tools/memory-model: Model 'smp_store_mb()' Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney
2018-04-16 16:12 ` Paul E. McKenney [this message]
2018-04-16 16:12 ` [PATCH tools/memory-model 17/17] tools/memory-model: Fix coding style in 'linux-kernel.def' Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1523895165-17576-17-git-send-email-paulmck@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akiyks@gmail.com \
--cc=andrea.parri@amarulasolutions.com \
--cc=boqun.feng@gmail.com \
--cc=dhowells@redhat.com \
--cc=j.alglave@ucl.ac.uk \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.maranget@inria.fr \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=parri.andrea@gmail.com \
--cc=peterz@infradead.org \
--cc=stern@rowland.harvard.edu \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).