aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwuchi <wuchi.zero@gmail.com>2022-06-19 15:46:41 +0800
committerakpm <akpm@linux-foundation.org>2022-07-17 17:31:37 -0700
commit62df90b53e6f332bb69b73621998826c49a17323 (patch)
tree2d414545c113543a6a08d5bb6a733c0d0751f1d2
parentlib/lru_cache: fix error free handing in lc_create (diff)
downloadlinux-dev-62df90b53e6f332bb69b73621998826c49a17323.tar.xz
linux-dev-62df90b53e6f332bb69b73621998826c49a17323.zip
net, lib/once: remove {net_}get_random_once_wait macro
DO_ONCE(func, ...) will call func with spinlock which acquired by spin_lock_irqsave in __do_once_start. But the get_random_once_wait will sleep in get_random_bytes_wait -> wait_for_random_bytes. Fortunately, there is no place to use {net_}get_random_once_wait, so we could remove them simply. Link: https://lkml.kernel.org/r/20220619074641.40916-1-wuchi.zero@gmail.com Signed-off-by: wuchi <wuchi.zero@gmail.com> Acked-by: Jakub Kicinski <kuba@kernel.org> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--include/linux/net.h2
-rw-r--r--include/linux/once.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index 12093f4db50c..8613772a1f58 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -303,8 +303,6 @@ do { \
#define net_get_random_once(buf, nbytes) \
get_random_once((buf), (nbytes))
-#define net_get_random_once_wait(buf, nbytes) \
- get_random_once_wait((buf), (nbytes))
/*
* E.g. XFS meta- & log-data is in slab pages, or bcache meta
diff --git a/include/linux/once.h b/include/linux/once.h
index f54523052bbc..b14d8b309d52 100644
--- a/include/linux/once.h
+++ b/include/linux/once.h
@@ -54,7 +54,5 @@ void __do_once_done(bool *done, struct static_key_true *once_key,
#define get_random_once(buf, nbytes) \
DO_ONCE(get_random_bytes, (buf), (nbytes))
-#define get_random_once_wait(buf, nbytes) \
- DO_ONCE(get_random_bytes_wait, (buf), (nbytes)) \
#endif /* _LINUX_ONCE_H */