diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-28 19:46:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-28 19:46:47 +0200 |
| commit | 83086d654dd08c0f57381522e6819f421677706e (patch) | |
| tree | bcb3d6f66916134de1a86c67db8a5829e3885ef3 /tools/memory-model/scripts/README | |
| parent | 556e2f6020bf90f63c5dd65e9a2254be6db3185b (diff) | |
| parent | b989ff070574ad8b8621d866de0a8e9a65d42c80 (diff) | |
| download | tip-83086d654dd08c0f57381522e6819f421677706e.tar.gz tip-83086d654dd08c0f57381522e6819f421677706e.tar.xz tip-83086d654dd08c0f57381522e6819f421677706e.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcucore/rcu
Pull rcu/next + tools/memory-model changes from Paul E. McKenney:
- RCU flavor consolidation cleanups and optmizations
- Documentation updates
- Miscellaneous fixes
- SRCU updates
- RCU-sync flavor consolidation
- Torture-test updates
- Linux-kernel memory-consistency-model updates, most notably the addition of plain C-language accesses
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/memory-model/scripts/README')
| -rw-r--r-- | tools/memory-model/scripts/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/memory-model/scripts/README b/tools/memory-model/scripts/README index 29375a1fbbfa..095c7eb36f9f 100644 --- a/tools/memory-model/scripts/README +++ b/tools/memory-model/scripts/README @@ -22,7 +22,7 @@ checklitmushist.sh Run all litmus tests having .litmus.out files from previous initlitmushist.sh or newlitmushist.sh runs, comparing the - herd output to that of the original runs. + herd7 output to that of the original runs. checklitmus.sh @@ -43,7 +43,7 @@ initlitmushist.sh judgelitmus.sh - Given a .litmus file and its .litmus.out herd output, check the + Given a .litmus file and its .litmus.out herd7 output, check the .litmus.out file against the .litmus file's "Result:" comment to judge whether the test ran correctly. Not normally run manually, provided instead for use by other scripts. |