Merge branch 'for-5.15-printk-index' into for-linus

[linux-2.6-microblaze.git] / lib / test_scanf.c

diff --git a/lib/test_scanf.c b/lib/test_scanf.c
index 84fe09e..abae888 100644 (file)
--- a/lib/test_scanf.c
+++ b/lib/test_scanf.c
@@ -271,7 +271,7 @@ static u32 __init next_test_random(u32 max_bits)
 {
        u32 n_bits = hweight32(prandom_u32_state(&rnd_state)) % (max_bits + 1);
 
-       return prandom_u32_state(&rnd_state) & (UINT_MAX >> (32 - n_bits));
+       return prandom_u32_state(&rnd_state) & GENMASK(n_bits, 0);
 }
 
 static unsigned long long __init next_test_random_ull(void)
@@ -280,7 +280,7 @@ static unsigned long long __init next_test_random_ull(void)
        u32 n_bits = (hweight32(rand1) * 3) % 64;
        u64 val = (u64)prandom_u32_state(&rnd_state) * rand1;
 
-       return val & (ULLONG_MAX >> (64 - n_bits));
+       return val & GENMASK_ULL(n_bits, 0);
 }
 
 #define random_for_type(T)                             \