Commit f8ee4361 authored by Muhammad Usama Anjum's avatar Muhammad Usama Anjum Committed by Andrew Morton

selftests/mm: mremap_test: fix build warning

Use 2 separate variables of types int and unsigned long long instead of
confusing them.  This corrects the correct print format for each of them
and removes the build warning:

warning: format `%d' expects argument of type `int', but argument 2 has type `long long unsigned int'

Link: https://lkml.kernel.org/r/20240112071851.612930-1-usama.anjum@collabora.com
Fixes: a4cb3b24 ("selftests: mm: add a test for remapping to area immediately after existing mapping")
Signed-off-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 19d3e221
...@@ -360,7 +360,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb, ...@@ -360,7 +360,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb,
char pattern_seed) char pattern_seed)
{ {
void *addr, *src_addr, *dest_addr, *dest_preamble_addr; void *addr, *src_addr, *dest_addr, *dest_preamble_addr;
unsigned long long i; int d;
unsigned long long t;
struct timespec t_start = {0, 0}, t_end = {0, 0}; struct timespec t_start = {0, 0}, t_end = {0, 0};
long long start_ns, end_ns, align_mask, ret, offset; long long start_ns, end_ns, align_mask, ret, offset;
unsigned long long threshold; unsigned long long threshold;
...@@ -378,8 +379,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb, ...@@ -378,8 +379,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb,
/* Set byte pattern for source block. */ /* Set byte pattern for source block. */
srand(pattern_seed); srand(pattern_seed);
for (i = 0; i < threshold; i++) for (t = 0; t < threshold; t++)
memset((char *) src_addr + i, (char) rand(), 1); memset((char *) src_addr + t, (char) rand(), 1);
/* Mask to zero out lower bits of address for alignment */ /* Mask to zero out lower bits of address for alignment */
align_mask = ~(c.dest_alignment - 1); align_mask = ~(c.dest_alignment - 1);
...@@ -420,8 +421,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb, ...@@ -420,8 +421,8 @@ static long long remap_region(struct config c, unsigned int threshold_mb,
/* Set byte pattern for the dest preamble block. */ /* Set byte pattern for the dest preamble block. */
srand(pattern_seed); srand(pattern_seed);
for (i = 0; i < c.dest_preamble_size; i++) for (d = 0; d < c.dest_preamble_size; d++)
memset((char *) dest_preamble_addr + i, (char) rand(), 1); memset((char *) dest_preamble_addr + d, (char) rand(), 1);
} }
clock_gettime(CLOCK_MONOTONIC, &t_start); clock_gettime(CLOCK_MONOTONIC, &t_start);
...@@ -437,14 +438,14 @@ static long long remap_region(struct config c, unsigned int threshold_mb, ...@@ -437,14 +438,14 @@ static long long remap_region(struct config c, unsigned int threshold_mb,
/* Verify byte pattern after remapping */ /* Verify byte pattern after remapping */
srand(pattern_seed); srand(pattern_seed);
for (i = 0; i < threshold; i++) { for (t = 0; t < threshold; t++) {
char c = (char) rand(); char c = (char) rand();
if (((char *) dest_addr)[i] != c) { if (((char *) dest_addr)[t] != c) {
ksft_print_msg("Data after remap doesn't match at offset %llu\n", ksft_print_msg("Data after remap doesn't match at offset %llu\n",
i); t);
ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff,
((char *) dest_addr)[i] & 0xff); ((char *) dest_addr)[t] & 0xff);
ret = -1; ret = -1;
goto clean_up_dest; goto clean_up_dest;
} }
...@@ -453,14 +454,14 @@ static long long remap_region(struct config c, unsigned int threshold_mb, ...@@ -453,14 +454,14 @@ static long long remap_region(struct config c, unsigned int threshold_mb,
/* Verify the dest preamble byte pattern after remapping */ /* Verify the dest preamble byte pattern after remapping */
if (c.dest_preamble_size) { if (c.dest_preamble_size) {
srand(pattern_seed); srand(pattern_seed);
for (i = 0; i < c.dest_preamble_size; i++) { for (d = 0; d < c.dest_preamble_size; d++) {
char c = (char) rand(); char c = (char) rand();
if (((char *) dest_preamble_addr)[i] != c) { if (((char *) dest_preamble_addr)[d] != c) {
ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", ksft_print_msg("Preamble data after remap doesn't match at offset %d\n",
i); d);
ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff,
((char *) dest_preamble_addr)[i] & 0xff); ((char *) dest_preamble_addr)[d] & 0xff);
ret = -1; ret = -1;
goto clean_up_dest; goto clean_up_dest;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment