0001-Revert-riscv-Use-latest-system-call-ABI.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001
  2. From: Alistair Francis <alistair.francis@wdc.com>
  3. Date: Tue, 16 Apr 2019 09:03:41 -0700
  4. Subject: [PATCH] Revert "riscv: Use latest system call ABI"
  5. This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b.
  6. The latest RISC-V 32bit glibc submission doesn't work with this patch,
  7. so let's revert it. This revert can be reverted when the glibc
  8. submission is updated to work on the 5.1 kernel.
  9. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  10. Upstream-Status: Inappropriate [enable feature]
  11. ---
  12. arch/riscv/Kconfig | 1 +
  13. arch/riscv/include/uapi/asm/unistd.h | 5 ++++-
  14. arch/riscv/kernel/vdso/Makefile | 2 --
  15. 3 files changed, 5 insertions(+), 3 deletions(-)
  16. diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
  17. index eb56c82d8aa1..43dd2680c696 100644
  18. --- a/arch/riscv/Kconfig
  19. +++ b/arch/riscv/Kconfig
  20. @@ -11,6 +11,7 @@ config 32BIT
  21. config RISCV
  22. def_bool y
  23. + select ARCH_32BIT_OFF_T if !64BIT
  24. # even on 32-bit, physical (and DMA) addresses are > 32-bits
  25. select PHYS_ADDR_T_64BIT
  26. select OF
  27. diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h
  28. index 0e2eeeb1fd27..486a288b454c 100644
  29. --- a/arch/riscv/include/uapi/asm/unistd.h
  30. +++ b/arch/riscv/include/uapi/asm/unistd.h
  31. @@ -17,8 +17,11 @@
  32. #ifdef __LP64__
  33. #define __ARCH_WANT_NEW_STAT
  34. -#define __ARCH_WANT_SET_GET_RLIMIT
  35. #endif /* __LP64__ */
  36. +#define __ARCH_WANT_SET_GET_RLIMIT
  37. +#ifndef __LP64__
  38. +#define __ARCH_WANT_TIME32_SYSCALLS
  39. +#endif
  40. #include <asm-generic/unistd.h>
  41. diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
  42. index fec62b24df89..eed1c137f618 100644
  43. --- a/arch/riscv/kernel/vdso/Makefile
  44. +++ b/arch/riscv/kernel/vdso/Makefile
  45. @@ -2,11 +2,9 @@
  46. # Symbols present in the vdso
  47. vdso-syms = rt_sigreturn
  48. -ifdef CONFIG_64BIT
  49. vdso-syms += gettimeofday
  50. vdso-syms += clock_gettime
  51. vdso-syms += clock_getres
  52. -endif
  53. vdso-syms += getcpu
  54. vdso-syms += flush_icache
  55. --
  56. 2.21.0