diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-10 12:19:28 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-10 12:19:28 +0300 |
commit | d88f1f1fdb9f8f60602b406c89342e113a19df7f (patch) | |
tree | 16da02010b66f7f54fde737c5c54e43980789f79 /tools/testing/selftests/bpf/test_maps.c | |
parent | 04860d48a8aba5b21ae5ba1f86b0d4e3bc628fff (diff) | |
parent | cdb06e9d8f520c969676e7d6778cffe5894f079f (diff) | |
download | linux-d88f1f1fdb9f8f60602b406c89342e113a19df7f.tar.xz |
Merge branch 'linus' into locking/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/test_maps.c')
-rw-r--r-- | tools/testing/selftests/bpf/test_maps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 436c4c72414f..9e03a4c356a4 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -126,6 +126,8 @@ static void test_hashmap_sizes(int task, void *data) fd = bpf_create_map(BPF_MAP_TYPE_HASH, i, j, 2, map_flags); if (fd < 0) { + if (errno == ENOMEM) + return; printf("Failed to create hashmap key=%d value=%d '%s'\n", i, j, strerror(errno)); exit(1); |