diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 02:09:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 02:09:29 -0500 |
commit | 86292b33d4b79ee03e2f43ea0381ef85f077c760 (patch) | |
tree | b69a6ffd8ec5ac01599d351205a96804b9c415da /tools | |
parent | 1ac884f173d4842216f6a24c03c9833e3ce6e982 (diff) | |
parent | 3e761a42e19c63b624ebac94d918d8a15e07e2a7 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton:
- a few MM remainders
- misc things
- autofs updates
- signals
- affs updates
- ipc
- nilfs2
- spelling.txt updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
mm: add arch-independent testcases for RODATA
hfs: atomically read inode size
mm: clarify mm_struct.mm_{users,count} documentation
mm: use mmget_not_zero() helper
mm: add new mmget() helper
mm: add new mmgrab() helper
checkpatch: warn when formats use %Z and suggest %z
lib/vsprintf.c: remove %Z support
scripts/spelling.txt: add some typo-words
scripts/spelling.txt: add "followings" pattern and fix typo instances
scripts/spelling.txt: add "therfore" pattern and fix typo instances
scripts/spelling.txt: add "overwriten" pattern and fix typo instances
scripts/spelling.txt: add "overwritting" pattern and fix typo instances
scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
scripts/spelling.txt: add "disassocation" pattern and fix typo instances
scripts/spelling.txt: add "omited" pattern and fix typo instances
scripts/spelling.txt: add "explictely" pattern and fix typo instances
scripts/spelling.txt: add "applys" pattern and fix typo instances
scripts/spelling.txt: add "configuartion" pattern and fix typo instances
...
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/bpf/bpf.c | 2 | ||||
-rw-r--r-- | tools/perf/Documentation/tips.txt | 2 | ||||
-rw-r--r-- | tools/perf/util/dso.c | 2 | ||||
-rw-r--r-- | tools/perf/util/probe-finder.c | 4 | ||||
-rw-r--r-- | tools/perf/util/sort.h | 2 | ||||
-rw-r--r-- | tools/testing/selftests/sigaltstack/sas.c | 7 |
6 files changed, 10 insertions, 9 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index d48b70ceb25a..207c2eeddab0 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "bpf.h" | 27 | #include "bpf.h" |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * When building perf, unistd.h is overrided. __NR_bpf is | 30 | * When building perf, unistd.h is overridden. __NR_bpf is |
31 | * required to be defined explicitly. | 31 | * required to be defined explicitly. |
32 | */ | 32 | */ |
33 | #ifndef __NR_bpf | 33 | #ifndef __NR_bpf |
diff --git a/tools/perf/Documentation/tips.txt b/tools/perf/Documentation/tips.txt index 8a6479c0eac9..170b0289a7bc 100644 --- a/tools/perf/Documentation/tips.txt +++ b/tools/perf/Documentation/tips.txt | |||
@@ -22,7 +22,7 @@ If you have debuginfo enabled, try: perf report -s sym,srcline | |||
22 | For memory address profiling, try: perf mem record / perf mem report | 22 | For memory address profiling, try: perf mem record / perf mem report |
23 | For tracepoint events, try: perf report -s trace_fields | 23 | For tracepoint events, try: perf report -s trace_fields |
24 | To record callchains for each sample: perf record -g | 24 | To record callchains for each sample: perf record -g |
25 | To record every process run by an user: perf record -u <user> | 25 | To record every process run by a user: perf record -u <user> |
26 | Skip collecing build-id when recording: perf record -B | 26 | Skip collecing build-id when recording: perf record -B |
27 | To change sampling frequency to 100 Hz: perf record -F 100 | 27 | To change sampling frequency to 100 Hz: perf record -F 100 |
28 | See assembly instructions with percentage: perf annotate <symbol> | 28 | See assembly instructions with percentage: perf annotate <symbol> |
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 28d41e709128..3abe3373ce90 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c | |||
@@ -951,7 +951,7 @@ static struct dso *__dso__findlink_by_longname(struct rb_root *root, | |||
951 | if (rc == 0) { | 951 | if (rc == 0) { |
952 | /* | 952 | /* |
953 | * In case the new DSO is a duplicate of an existing | 953 | * In case the new DSO is a duplicate of an existing |
954 | * one, print an one-time warning & put the new entry | 954 | * one, print a one-time warning & put the new entry |
955 | * at the end of the list of duplicates. | 955 | * at the end of the list of duplicates. |
956 | */ | 956 | */ |
957 | if (!dso || (dso == this)) | 957 | if (!dso || (dso == this)) |
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 0d9d6e0803b8..57cd268d4275 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c | |||
@@ -464,7 +464,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname, | |||
464 | /* Verify it is a data structure */ | 464 | /* Verify it is a data structure */ |
465 | tag = dwarf_tag(&type); | 465 | tag = dwarf_tag(&type); |
466 | if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) { | 466 | if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) { |
467 | pr_warning("%s is not a data structure nor an union.\n", | 467 | pr_warning("%s is not a data structure nor a union.\n", |
468 | varname); | 468 | varname); |
469 | return -EINVAL; | 469 | return -EINVAL; |
470 | } | 470 | } |
@@ -479,7 +479,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname, | |||
479 | } else { | 479 | } else { |
480 | /* Verify it is a data structure */ | 480 | /* Verify it is a data structure */ |
481 | if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) { | 481 | if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) { |
482 | pr_warning("%s is not a data structure nor an union.\n", | 482 | pr_warning("%s is not a data structure nor a union.\n", |
483 | varname); | 483 | varname); |
484 | return -EINVAL; | 484 | return -EINVAL; |
485 | } | 485 | } |
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 7aff317fc7c4..796c847e2f00 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h | |||
@@ -108,7 +108,7 @@ struct hist_entry { | |||
108 | /* | 108 | /* |
109 | * Since perf diff only supports the stdio output, TUI | 109 | * Since perf diff only supports the stdio output, TUI |
110 | * fields are only accessed from perf report (or perf | 110 | * fields are only accessed from perf report (or perf |
111 | * top). So make it an union to reduce memory usage. | 111 | * top). So make it a union to reduce memory usage. |
112 | */ | 112 | */ |
113 | struct hist_entry_diff diff; | 113 | struct hist_entry_diff diff; |
114 | struct /* for TUI */ { | 114 | struct /* for TUI */ { |
diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c index 1bb01258e559..ccd07343d418 100644 --- a/tools/testing/selftests/sigaltstack/sas.c +++ b/tools/testing/selftests/sigaltstack/sas.c | |||
@@ -57,7 +57,7 @@ void my_usr1(int sig, siginfo_t *si, void *u) | |||
57 | exit(EXIT_FAILURE); | 57 | exit(EXIT_FAILURE); |
58 | } | 58 | } |
59 | if (stk.ss_flags != SS_DISABLE) | 59 | if (stk.ss_flags != SS_DISABLE) |
60 | printf("[FAIL]\tss_flags=%i, should be SS_DISABLE\n", | 60 | printf("[FAIL]\tss_flags=%x, should be SS_DISABLE\n", |
61 | stk.ss_flags); | 61 | stk.ss_flags); |
62 | else | 62 | else |
63 | printf("[OK]\tsigaltstack is disabled in sighandler\n"); | 63 | printf("[OK]\tsigaltstack is disabled in sighandler\n"); |
@@ -122,7 +122,8 @@ int main(void) | |||
122 | if (stk.ss_flags == SS_DISABLE) { | 122 | if (stk.ss_flags == SS_DISABLE) { |
123 | printf("[OK]\tInitial sigaltstack state was SS_DISABLE\n"); | 123 | printf("[OK]\tInitial sigaltstack state was SS_DISABLE\n"); |
124 | } else { | 124 | } else { |
125 | printf("[FAIL]\tInitial sigaltstack state was %i; should have been SS_DISABLE\n", stk.ss_flags); | 125 | printf("[FAIL]\tInitial sigaltstack state was %x; " |
126 | "should have been SS_DISABLE\n", stk.ss_flags); | ||
126 | return EXIT_FAILURE; | 127 | return EXIT_FAILURE; |
127 | } | 128 | } |
128 | 129 | ||
@@ -165,7 +166,7 @@ int main(void) | |||
165 | exit(EXIT_FAILURE); | 166 | exit(EXIT_FAILURE); |
166 | } | 167 | } |
167 | if (stk.ss_flags != SS_AUTODISARM) { | 168 | if (stk.ss_flags != SS_AUTODISARM) { |
168 | printf("[FAIL]\tss_flags=%i, should be SS_AUTODISARM\n", | 169 | printf("[FAIL]\tss_flags=%x, should be SS_AUTODISARM\n", |
169 | stk.ss_flags); | 170 | stk.ss_flags); |
170 | exit(EXIT_FAILURE); | 171 | exit(EXIT_FAILURE); |
171 | } | 172 | } |