prandom: remove prandom_u32_max()

Convert the final two users of prandom_u32_max() that slipped in during
6.2-rc1 to use get_random_u32_below().

Then, with no more users left, we can finally remove the deprecated
function.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c
index 8bb1aa6..7316a82 100644 (file)
--- a/arch/x86/mm/cpu_entry_area.c
+++ b/arch/x86/mm/cpu_entry_area.c
@@ -36,7 +36,7 @@ static __init void init_cea_offsets(void)
                unsigned int cea;
 
 again:
-               cea = prandom_u32_max(max_cea);
+               cea = get_random_u32_below(max_cea);
 
                for_each_possible_cpu(j) {
                        if (cea_offset(j) == cea)

diff --git a/include/linux/prandom.h b/include/linux/prandom.h
index c94c02b..f2ed5b7 100644 (file)
--- a/include/linux/prandom.h
+++ b/include/linux/prandom.h
@@ -24,12 +24,6 @@ void prandom_seed_full_state(struct rnd_state __percpu *pcpu_state);
 #define prandom_init_once(pcpu_state)                  \
        DO_ONCE(prandom_seed_full_state, (pcpu_state))
 
-/* Deprecated: use get_random_u32_below() instead. */
-static inline u32 prandom_u32_max(u32 ep_ro)
-{
-       return get_random_u32_below(ep_ro);
-}
-
 /*
  * Handle minimum values for seeds
  */

diff --git a/net/ipv4/tcp_plb.c b/net/ipv4/tcp_plb.c
index bb1a08f..4bcf7ef 100644 (file)
--- a/net/ipv4/tcp_plb.c
+++ b/net/ipv4/tcp_plb.c
@@ -97,7 +97,7 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb)
                return;
 
        pause = READ_ONCE(net->ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ;
-       pause += prandom_u32_max(pause);
+       pause += get_random_u32_below(pause);
        plb->pause_until = tcp_jiffies32 + pause;
 
        /* Reset PLB state upon RTO, since an RTO causes a sk_rethink_txhash() call