diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 17:26:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 17:26:36 -0700 |
| commit | 8712a00514e50aafa7c9bf5cd3955fa60758e53b (patch) | |
| tree | f5a571fb60ee2fe1320001aed744eaa5e8c832e0 /tools | |
| parent | e6a4b6f5eaa8478b7a0b9a17e40c51463631db1a (diff) | |
| parent | 0eb808eb753cd44e740da8e64f5c97a2a8e07578 (diff) | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton:
"Nine fixes"
* emailed patches from Andrew Morton akpm@linux-foundation.org>:
cris: convert ffs from an object-like macro to a function-like macro
hfsplus: add HFSX subfolder count support
tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly
MAINTAINERS: blackfin: add git repository
revert "kallsyms: fix absolute addresses for kASLR"
mm/Kconfig: fix URL for zsmalloc benchmark
fs/proc/base.c: fix GPF in /proc/$PID/map_files
mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block
mm: fix GFP_THISNODE callers and clarify
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/ipc/msgque.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c index d66418237d21..aa290c0de6f5 100644 --- a/tools/testing/selftests/ipc/msgque.c +++ b/tools/testing/selftests/ipc/msgque.c @@ -201,6 +201,7 @@ int main(int argc, char **argv) msgque.msq_id = msgget(msgque.key, IPC_CREAT | IPC_EXCL | 0666); if (msgque.msq_id == -1) { + err = -errno; printf("Can't create queue\n"); goto err_out; } |