diff options
author | Edward Liaw <edliaw@google.com> | 2024-02-29 06:49:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 06:49:01 +0000 |
commit | 58a527d9394c64210732cb3f1a17dab458e15523 (patch) | |
tree | f74b010ad8edb89b855ae0e48ebdaa0a4a997fbd /testcases/kernel/mem/tunable/overcommit_memory.c | |
parent | 148971c1c4d67c42d5c95013a56539e08dcebbde (diff) | |
parent | 1470d306139c8cef017d97095952c47c7b06c2a8 (diff) | |
download | ltp-58a527d9394c64210732cb3f1a17dab458e15523.tar.gz |
Merge tag '20240129' am: 1470d30613
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2983197
Change-Id: I0100ddfad10fd2864e7e0d5c9b3d07e371f1998a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'testcases/kernel/mem/tunable/overcommit_memory.c')
-rw-r--r-- | testcases/kernel/mem/tunable/overcommit_memory.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c index ffb7a6d9d..d055dd18f 100644 --- a/testcases/kernel/mem/tunable/overcommit_memory.c +++ b/testcases/kernel/mem/tunable/overcommit_memory.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (c) 2012-2020 Linux Test Project + * Copyright (c) 2012-2023 Linux Test Project * Copyright (c) 2012-2017 Red Hat, Inc. * * There are two tunables overcommit_memory and overcommit_ratio under @@ -62,7 +62,6 @@ #include <stdio.h> #include <stdlib.h> #include <limits.h> -#include "lapi/abisize.h" #include "mem.h" #define DEFAULT_OVER_RATIO 50L @@ -124,10 +123,6 @@ static void setup(void) static void overcommit_memory_test(void) { - -#ifdef TST_ABI32 - tst_brk(TCONF, "test is not designed for 32-bit system."); -#endif /* start to test overcommit_memory=2 */ set_sys_tune("overcommit_memory", 2, 1); @@ -256,6 +251,7 @@ static struct tst_test test = { }, .setup = setup, .test_all = overcommit_memory_test, + .skip_in_compat = 1, .save_restore = (const struct tst_path_val[]) { {"/proc/sys/vm/overcommit_memory", NULL, TST_SR_TBROK}, {"/proc/sys/vm/overcommit_ratio", NULL, TST_SR_TBROK}, |