diff options
| author | Clark Williams <williams@redhat.com> | 2010-02-24 15:07:50 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2010-02-24 15:07:50 -0600 |
| commit | 6fc24e1719bbaf7afb9aec1921bc7ba220429b2d (patch) | |
| tree | d6aba18cbb842c665763151034862f657d7655f5 | |
| parent | 2afa6340dcc492b0a70683c96fea6ec31189f54f (diff) | |
| parent | 0fbe09d46cbbe05fdc19b6b8b155ebcc1448f33d (diff) | |
| download | rt-tests-6fc24e1719bbaf7afb9aec1921bc7ba220429b2d.tar.gz | |
Merge remote branch 'uwe/for-clark' into work
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/cyclictest/cyclictest.8 | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -45,10 +45,7 @@ VPATH += src/hackbench # Pattern rule to generate dependency files from .c files %.d: %.c - @set -e; rm -f $@; \ - $(CC) -MM $(CFLAGS) $< > $@.$$$$; \ - sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ - rm -f $@.$$$$ + @$(CC) -MM $(CFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ || rm -f $@ .PHONY: all all: $(TARGETS) hwlatdetect @@ -115,6 +112,7 @@ install: all install -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" mkdir -p "$(DESTDIR)$(srcdir)/backfire" + install -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" diff --git a/src/cyclictest/cyclictest.8 b/src/cyclictest/cyclictest.8 index 8f846c6..91e1102 100644 --- a/src/cyclictest/cyclictest.8 +++ b/src/cyclictest/cyclictest.8 @@ -130,7 +130,7 @@ set the ftrace tracer function. Used with the \-b option. Must be one of the trace functions available from <debugfs-mountpoint>/kernel/debug/tracing/available_tracers .TP .B \-t, \-\-threads[=NUM] -Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specifed, NUM is set to +Set the number of test threads (default is 1). Create NUM test threads. If NUM is not specified, NUM is set to the number of available CPUs. See \-d, \-i and \-p for further information. .TP .B \-m, \-\-mlockall |