From: tip-bot for Andrea Parri <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: andrea.parri@amarulasolutions.com, linux-kernel@vger.kernel.org,
tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org,
paulmck@linux.vnet.ibm.com, akpm@linux-foundation.org,
peterz@infradead.org, mingo@kernel.org, will.deacon@arm.com
Subject: [tip:locking/core] tools/memory-model: Fix coding style in 'linux-kernel.def'
Date: Mon, 14 May 2018 23:30:44 -0700 [thread overview]
Message-ID: <tip-d17013e0bac66bb4d1be44f061754c7e53292b64@git.kernel.org> (raw)
In-Reply-To: <1526340837-12222-8-git-send-email-paulmck@linux.vnet.ibm.com>
Commit-ID: d17013e0bac66bb4d1be44f061754c7e53292b64
Gitweb: https://git.kernel.org/tip/d17013e0bac66bb4d1be44f061754c7e53292b64
Author: Andrea Parri <andrea.parri@amarulasolutions.com>
AuthorDate: Mon, 14 May 2018 16:33:46 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 15 May 2018 08:11:17 +0200
tools/memory-model: Fix coding style in 'linux-kernel.def'
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>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: npiggin@gmail.com
Cc: parri.andrea@gmail.com
Cc: stern@rowland.harvard.edu
Link: http://lkml.kernel.org/r/1526340837-12222-8-git-send-email-paulmck@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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)
next prev parent reply other threads:[~2018-05-15 6:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 23:33 [PATCH memory-model 0/19] Updates to the formal memory model Paul E. McKenney
2018-05-14 23:33 ` [PATCH memory-model 01/19] tools/memory-model: Rename link and rcu-path to rcu-link and rb Paul E. McKenney
2018-05-15 6:27 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 02/19] tools/memory-model: Redefine rb in terms of rcu-fence Paul E. McKenney
2018-05-15 6:27 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 03/19] tools/memory-model: Update required version of herdtools7 Paul E. McKenney
2018-05-15 6:28 ` [tip:locking/core] " tip-bot for Akira Yokosawa
2018-05-14 23:33 ` [PATCH memory-model 04/19] tools/memory-model: Fix cheat sheet typo Paul E. McKenney
2018-05-15 6:28 ` [tip:locking/core] " tip-bot for Paolo Bonzini
2018-05-14 23:33 ` [PATCH memory-model 05/19] tools/memory-order: Improve key for SELF and SV Paul E. McKenney
2018-05-15 6:29 ` [tip:locking/core] " tip-bot for Paul E. McKenney
2018-05-14 23:33 ` [PATCH memory-model 06/19] tools/memory-order: smp_mb__after_atomic() orders later RMW operations Paul E. McKenney
2018-05-15 6:29 ` [tip:locking/core] tools/memory-order: Update the cheat-sheet to show that " tip-bot for Paul E. McKenney
2018-05-14 23:33 ` [PATCH memory-model 07/19] tools/memory-model: Model 'smp_store_mb()' Paul E. McKenney
2018-05-15 6:30 ` [tip:locking/core] " tip-bot for Andrea Parri
2018-05-14 23:33 ` [PATCH memory-model 08/19] tools/memory-model: Fix coding style in 'linux-kernel.def' Paul E. McKenney
2018-05-15 6:30 ` tip-bot for Andrea Parri [this message]
2018-05-14 23:33 ` [PATCH memory-model 09/19] tools/memory-model: Add scripts to test memory model Paul E. McKenney
2018-05-15 6:31 ` [tip:locking/core] " tip-bot for Paul E. McKenney
2018-05-14 23:33 ` [PATCH memory-model 10/19] tools/memory-model: Add model support for spin_is_locked Paul E. McKenney
2018-05-15 6:31 ` [tip:locking/core] tools/memory-model: Add model support for spin_is_locked() tip-bot for Luc Maranget
2018-05-14 23:33 ` [PATCH memory-model 11/19] tools/memory-model: Flag "cumulativity" and "propagation" tests Paul E. McKenney
2018-05-15 6:32 ` [tip:locking/core] " tip-bot for Paul E. McKenney
2018-05-14 23:33 ` [PATCH memory-model 12/19] tools/memory-model: Remove duplicated code from lock.cat Paul E. McKenney
2018-05-15 6:32 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 13/19] tools/memory-model: Improve comments in lock.cat Paul E. McKenney
2018-05-15 6:33 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 14/19] tools/memory-model: Improve mixed-access checking " Paul E. McKenney
2018-05-15 6:33 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 15/19] tools/memory-model: Remove out-of-date comments and code from lock.cat Paul E. McKenney
2018-05-15 6:34 ` [tip:locking/core] " tip-bot for Alan Stern
2018-05-14 23:33 ` [PATCH memory-model 16/19] tools/memory-model: Fix coding style in 'lock.cat' Paul E. McKenney
2018-05-15 6:34 ` [tip:locking/core] " tip-bot for Andrea Parri
2018-05-14 23:33 ` [PATCH memory-model 17/19] MAINTAINERS: Update e-mail address for Andrea Parri Paul E. McKenney
2018-05-15 6:35 ` [tip:locking/core] MAINTAINERS, tools/memory-model: " tip-bot for Andrea Parri
2018-05-14 23:33 ` [PATCH memory-model 18/19] tools/memory-model: Update ASPLOS information Paul E. McKenney
2018-05-15 6:35 ` [tip:locking/core] " tip-bot for Andrea Parri
2018-05-14 23:33 ` [PATCH memory-model 19/19] tools/memory-model: Add reference for 'Simplifying ARM concurrency' Paul E. McKenney
2018-05-15 6:36 ` [tip:locking/core] " tip-bot for Andrea Parri
2018-05-15 6:15 ` [PATCH memory-model 0/19] Updates to the formal memory model Ingo Molnar
2018-05-15 16:20 ` 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=tip-d17013e0bac66bb4d1be44f061754c7e53292b64@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=andrea.parri@amarulasolutions.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--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
Powered by JetHome