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/testing | |
| 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/testing')
| -rw-r--r-- | tools/testing/selftests/sigaltstack/sas.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 | } |
