aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-17 20:05:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-17 20:05:30 -0400
commit16bf8348055fe4615bd08ef50f9874f5dcc10268 (patch)
tree5b693edb74cb8e2a18b78f7a5cb8d9d9ce6ebafa /tools
parenta7fd20d1c476af4563e66865213474a2f9f473a4 (diff)
parent52bbe141f37f093e2c612e97c40d27422e5a1fdf (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (21 commits) gitignore: fix wording mfd: ab8500-debugfs: fix "between" in printk memstick: trivial fix of spelling mistake on management cpupowerutils: bench: fix "average" treewide: Fix typos in printk IB/mlx4: printk fix pinctrl: sirf/atlas7: fix printk spelling serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/ w1: comment spelling s/minmum/minimum/ Blackfin: comment spelling s/divsor/divisor/ metag: Fix misspellings in comments. ia64: Fix misspellings in comments. hexagon: Fix misspellings in comments. tools/perf: Fix misspellings in comments. cris: Fix misspellings in comments. c6x: Fix misspellings in comments. blackfin: Fix misspelling of 'register' in comment. avr32: Fix misspelling of 'definitions' in comment. treewide: Fix typos in printk Doc: treewide : Fix typos in DocBook/filesystem.xml ...
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/tests/openat-syscall-all-cpus.c2
-rw-r--r--tools/perf/util/evsel.c2
-rw-r--r--tools/perf/util/machine.c2
-rw-r--r--tools/perf/util/parse-events.c2
-rw-r--r--tools/perf/util/session.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
index 53c2273e8859..ad1cb63139a7 100644
--- a/tools/perf/tests/openat-syscall-all-cpus.c
+++ b/tools/perf/tests/openat-syscall-all-cpus.c
@@ -73,7 +73,7 @@ int test__openat_syscall_event_on_all_cpus(int subtest __maybe_unused)
73 } 73 }
74 74
75 /* 75 /*
76 * Here we need to explicitely preallocate the counts, as if 76 * Here we need to explicitly preallocate the counts, as if
77 * we use the auto allocation it will allocate just for 1 cpu, 77 * we use the auto allocation it will allocate just for 1 cpu,
78 * as we start by cpu 0. 78 * as we start by cpu 0.
79 */ 79 */
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 964c7c3602c0..52c7d8884741 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -827,7 +827,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
827 perf_evsel__set_sample_bit(evsel, PERIOD); 827 perf_evsel__set_sample_bit(evsel, PERIOD);
828 828
829 /* 829 /*
830 * When the user explicitely disabled time don't force it here. 830 * When the user explicitly disabled time don't force it here.
831 */ 831 */
832 if (opts->sample_time && 832 if (opts->sample_time &&
833 (!perf_missing_features.sample_id_all && 833 (!perf_missing_features.sample_id_all &&
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 639a2903065e..f9644f79686c 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -362,7 +362,7 @@ out_err:
362} 362}
363 363
364/* 364/*
365 * Caller must eventually drop thread->refcnt returned with a successfull 365 * Caller must eventually drop thread->refcnt returned with a successful
366 * lookup/new thread inserted. 366 * lookup/new thread inserted.
367 */ 367 */
368static struct thread *____machine__findnew_thread(struct machine *machine, 368static struct thread *____machine__findnew_thread(struct machine *machine,
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bcbc983d4b12..c6fd0479f4cd 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1649,7 +1649,7 @@ static void parse_events_print_error(struct parse_events_error *err,
1649 1649
1650 buf = _buf; 1650 buf = _buf;
1651 1651
1652 /* We're cutting from the beggining. */ 1652 /* We're cutting from the beginning. */
1653 if (err->idx > max_err_idx) 1653 if (err->idx > max_err_idx)
1654 cut = err->idx - max_err_idx; 1654 cut = err->idx - max_err_idx;
1655 1655
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 2335b2824d8a..5214974e841a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -557,7 +557,7 @@ static u8 revbyte(u8 b)
557 557
558/* 558/*
559 * XXX this is hack in attempt to carry flags bitfield 559 * XXX this is hack in attempt to carry flags bitfield
560 * throught endian village. ABI says: 560 * through endian village. ABI says:
561 * 561 *
562 * Bit-fields are allocated from right to left (least to most significant) 562 * Bit-fields are allocated from right to left (least to most significant)
563 * on little-endian implementations and from left to right (most to least 563 * on little-endian implementations and from left to right (most to least