Commit-ID: 05604e7e3adbd78f074b7f86b14f50888bf66252 Gitweb: https://git.kernel.org/tip/05604e7e3adbd78f074b7f86b14f50888bf66252 Author: Andrea Parri <andrea.parri@xxxxxxxxxxxxxxxxxxxx> AuthorDate: Mon, 14 May 2018 16:33:54 -0700 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Tue, 15 May 2018 08:11:18 +0200 tools/memory-model: Fix coding style in 'lock.cat' This commit uses tabs for indentation and adds spaces around binary operator. Signed-off-by: Andrea Parri <andrea.parri@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: akiyks@xxxxxxxxx Cc: boqun.feng@xxxxxxxxx Cc: dhowells@xxxxxxxxxx Cc: j.alglave@xxxxxxxxx Cc: linux-arch@xxxxxxxxxxxxxxx Cc: luc.maranget@xxxxxxxx Cc: npiggin@xxxxxxxxx Cc: parri.andrea@xxxxxxxxx Cc: stern@xxxxxxxxxxxxxxxxxxx Link: http://lkml.kernel.org/r/1526340837-12222-16-git-send-email-paulmck@xxxxxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- tools/memory-model/lock.cat | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/memory-model/lock.cat b/tools/memory-model/lock.cat index cd002a33ca8a..305ded17e741 100644 --- a/tools/memory-model/lock.cat +++ b/tools/memory-model/lock.cat @@ -84,16 +84,16 @@ let rfi-lf = ([LKW] ; po-loc ; [LF]) \ ([LKW] ; po-loc ; [UL] ; po-loc) (* rfe for LF events *) let all-possible-rfe-lf = - (* - * Given an LF event r, compute the possible rfe edges for that event - * (all those starting from LKW events in other threads), - * and then convert that relation to a set of single-edge relations. - *) - let possible-rfe-lf r = - let pair-to-relation p = p ++ 0 - in map pair-to-relation ((LKW * {r}) & loc & ext) - (* Do this for each LF event r that isn't in rfi-lf *) - in map possible-rfe-lf (LF \ range(rfi-lf)) + (* + * Given an LF event r, compute the possible rfe edges for that event + * (all those starting from LKW events in other threads), + * and then convert that relation to a set of single-edge relations. + *) + let possible-rfe-lf r = + let pair-to-relation p = p ++ 0 + in map pair-to-relation ((LKW * {r}) & loc & ext) + (* Do this for each LF event r that isn't in rfi-lf *) + in map possible-rfe-lf (LF \ range(rfi-lf)) (* Generate all rf relations for LF events *) with rfe-lf from cross(all-possible-rfe-lf) @@ -110,10 +110,10 @@ let rfi-ru = ([UL] ; po-loc ; [RU]) \ ([UL] ; po-loc ; [LKW] ; po-loc) (* rfe for RU events: an RU may read from an external UL or the initial write *) let all-possible-rfe-ru = - let possible-rfe-ru r = - let pair-to-relation p = p ++ 0 - in map pair-to-relation (((UL|IW) * {r}) & loc & ext) - in map possible-rfe-ru RU + let possible-rfe-ru r = + let pair-to-relation p = p ++ 0 + in map pair-to-relation (((UL | IW) * {r}) & loc & ext) + in map possible-rfe-ru RU (* Generate all rf relations for RU events *) with rfe-ru from cross(all-possible-rfe-ru) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |