diff mbox series

selftests: riscv: Allow mmap test to compile on 32-bit

Message ID 20240808-mmap_tests__fixes-v1-1-b1344b642a84@rivosinc.com
State Accepted
Commit 11c2dbd7f2415731ac8213d3de0dbd5f5dd0ddc7
Headers show
Series selftests: riscv: Allow mmap test to compile on 32-bit | expand

Commit Message

Charlie Jenkins Aug. 8, 2024, 6:41 p.m. UTC 
Macros needed for 32-bit compilations were hidden behind 64-bit riscv
ifdefs. Fix the 32-bit compilations by moving macros to allow the
memory_layout test to run on 32-bit.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: 73d05262a2ca ("selftests: riscv: Generalize mm selftests")
---
 tools/testing/selftests/riscv/mm/mmap_test.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


---
base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b
change-id: 20240807-mmap_tests__fixes-651cc2b5fead

Comments

patchwork-bot+linux-riscv@kernel.org Sept. 17, 2024, 4:30 p.m. UTC | #1 
Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:

On Thu, 08 Aug 2024 11:41:40 -0700 you wrote:
> Macros needed for 32-bit compilations were hidden behind 64-bit riscv
> ifdefs. Fix the 32-bit compilations by moving macros to allow the
> memory_layout test to run on 32-bit.
> 
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> Fixes: 73d05262a2ca ("selftests: riscv: Generalize mm selftests")
> 
> [...]

Here is the summary with links:
  - selftests: riscv: Allow mmap test to compile on 32-bit
    https://git.kernel.org/riscv/c/11c2dbd7f241

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/testing/selftests/riscv/mm/mmap_test.h b/tools/testing/selftests/riscv/mm/mmap_test.h
index 3b29ca3bb3d4..1c3313c201d5 100644
--- a/tools/testing/selftests/riscv/mm/mmap_test.h
+++ b/tools/testing/selftests/riscv/mm/mmap_test.h
@@ -48,11 +48,11 @@  uint32_t random_addresses[] = {
 };
 #endif
 
-// Only works on 64 bit
-#if __riscv_xlen == 64
 #define PROT (PROT_READ | PROT_WRITE)
 #define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS)
 
+// Only works on 64 bit
+#if __riscv_xlen == 64
 /* mmap must return a value that doesn't use more bits than the hint address. */
 static inline unsigned long get_max_value(unsigned long input)
 {
@@ -80,6 +80,8 @@  static inline unsigned long get_max_value(unsigned long input)
 	})
 #endif /* __riscv_xlen == 64 */
 
+#define TEST_MMAPS do { } while (0)
+
 static inline int memory_layout(void)
 {
 	void *value1 = mmap(NULL, sizeof(int), PROT, FLAGS, 0, 0);