From: Alistair Francis alistair.francis@wdc.com
euleros inclusion category: feature bugzilla: NA CVE: NA
This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b.
The latest RISC-V 32bit glibc submission doesn't work with this patch, so let's revert it. This revert can be reverted when the glibc submission is updated to work on the 5.1 kernel.
Link: https://gitee.com/openeuler/kernel/issues/I26X9V Signed-off-by: Alistair Francis alistair.francis@wdc.com Upstream-Status: Inappropriate [enable feature] --- arch/riscv/Kconfig | 1 + arch/riscv/include/uapi/asm/unistd.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 44377fd78..35aed0796 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -12,6 +12,7 @@ config 32BIT
config RISCV def_bool y + select ARCH_32BIT_OFF_T if !64BIT select ARCH_CLOCKSOURCE_INIT select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_HAS_BINFMT_FLAT diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h index 4b989ae15..4c14aa594 100644 --- a/arch/riscv/include/uapi/asm/unistd.h +++ b/arch/riscv/include/uapi/asm/unistd.h @@ -17,9 +17,12 @@
#ifdef __LP64__ #define __ARCH_WANT_NEW_STAT -#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYS_CLONE3 #endif /* __LP64__ */ +#define __ARCH_WANT_SET_GET_RLIMIT +#ifndef __LP64__ +#define __ARCH_WANT_TIME32_SYSCALLS +#endif
#include <asm-generic/unistd.h>