diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
| commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
| tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /tools/perf | |
| parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
| parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/callchain.h | 2 | ||||
| -rw-r--r-- | tools/perf/util/parse-events-test.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/python-ext-sources | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index 3bdb407f9cd..eb340571e7d 100644 --- a/tools/perf/util/callchain.h +++ b/tools/perf/util/callchain.h | |||
| @@ -58,7 +58,7 @@ struct callchain_list { | |||
| 58 | /* | 58 | /* |
| 59 | * A callchain cursor is a single linked list that | 59 | * A callchain cursor is a single linked list that |
| 60 | * let one feed a callchain progressively. | 60 | * let one feed a callchain progressively. |
| 61 | * It keeps persitent allocated entries to minimize | 61 | * It keeps persistent allocated entries to minimize |
| 62 | * allocations. | 62 | * allocations. |
| 63 | */ | 63 | */ |
| 64 | struct callchain_cursor_node { | 64 | struct callchain_cursor_node { |
diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c index 127d648cc54..607dd290b31 100644 --- a/tools/perf/util/parse-events-test.c +++ b/tools/perf/util/parse-events-test.c | |||
| @@ -752,7 +752,7 @@ static int test_pmu(void) | |||
| 752 | 752 | ||
| 753 | ret = stat(path, &st); | 753 | ret = stat(path, &st); |
| 754 | if (ret) | 754 | if (ret) |
| 755 | pr_debug("ommiting PMU cpu tests\n"); | 755 | pr_debug("omitting PMU cpu tests\n"); |
| 756 | return !ret; | 756 | return !ret; |
| 757 | } | 757 | } |
| 758 | 758 | ||
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 213362850ab..c40c2d33199 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # | 1 | # |
| 2 | # List of files needed by perf python extention | 2 | # List of files needed by perf python extension |
| 3 | # | 3 | # |
| 4 | # Each source file must be placed on its own line so that it can be | 4 | # Each source file must be placed on its own line so that it can be |
| 5 | # processed by Makefile and util/setup.py accordingly. | 5 | # processed by Makefile and util/setup.py accordingly. |