From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001 From: "Hongzhi.Song" Date: Mon, 15 Jul 2019 03:39:06 -0400 Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable with mips32 Error info: getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur = ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff According to kernel code: [arch/mips/include/uapi/asm/resource.h] RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32. /* * SuS says limits have to be unsigned. * Which makes a ton more sense anyway, * but we keep the old value on MIPS32, * for compatibility: */ #ifndef __mips64 # define RLIM_INFINITY 0x7fffffffUL #endif Adding conditional statement about mips to fix this. Signed-off-by: Jan Stancek Signed-off-by: Hongzhi.Song Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde] Signed-off-by: Hongzhi.Song --- testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c b/testcases/kernel/syscalls/getrlimit/getrlimit03.c index e4d56c4..319bc49 100644 --- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c +++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c @@ -26,6 +26,7 @@ #include "tst_test.h" #include "lapi/syscalls.h" +#include "lapi/abisize.h" /** * Linux provides an "old" getrlimit syscall handler that uses signed long, @@ -61,7 +62,12 @@ struct rlimit_ulong { unsigned long rlim_cur; unsigned long rlim_max; }; -const unsigned long RLIM_INFINITY_UL = ULONG_MAX; + +#if defined(__mips__) && defined(TST_ABI32) + const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL; +#else + const unsigned long RLIM_INFINITY_UL = ULONG_MAX; +#endif static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim) { -- 2.7.4