Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'random-6.13-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random

Pull random number generator updates from Jason Donenfeld:
"This contains a single series from Uros to replace uses of
<linux/random.h> with prandom.h or other more specific headers
as needed, in order to avoid a circular header issue.

Uros' goal is to be able to use percpu.h from prandom.h, which
will then allow him to define __percpu in percpu.h rather than
in compiler_types.h"

* tag 'random-6.13-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random:
prandom: Include <linux/percpu.h> in <linux/prandom.h>
random: Do not include <linux/prandom.h> in <linux/random.h>
netem: Include <linux/prandom.h> in sch_netem.c
lib/test_scanf: Include <linux/prandom.h> instead of <linux/random.h>
lib/test_parman: Include <linux/prandom.h> instead of <linux/random.h>
bpf/tests: Include <linux/prandom.h> instead of <linux/random.h>
lib/rbtree-test: Include <linux/prandom.h> instead of <linux/random.h>
random32: Include <linux/prandom.h> instead of <linux/random.h>
kunit: string-stream-test: Include <linux/prandom.h>
lib/interval_tree_test.c: Include <linux/prandom.h> instead of <linux/random.h>
bpf: Include <linux/prandom.h> instead of <linux/random.h>
scsi: libfcoe: Include <linux/prandom.h> instead of <linux/random.h>
fscrypt: Include <linux/once.h> in fs/crypto/keyring.c
mtd: tests: Include <linux/prandom.h> instead of <linux/random.h>
media: vivid: Include <linux/prandom.h> in vivid-vid-cap.c
drm/lib: Include <linux/prandom.h> instead of <linux/random.h>
drm/i915/selftests: Include <linux/prandom.h> instead of <linux/random.h>
crypto: testmgr: Include <linux/prandom.h> instead of <linux/random.h>
x86/kaslr: Include <linux/prandom.h> instead of <linux/random.h>

+22 -24
+1 -1
arch/x86/mm/kaslr.c
··· 22 22 23 23 #include <linux/kernel.h> 24 24 #include <linux/init.h> 25 - #include <linux/random.h> 25 + #include <linux/prandom.h> 26 26 #include <linux/memblock.h> 27 27 #include <linux/pgtable.h> 28 28
+1 -1
crypto/testmgr.c
··· 23 23 #include <linux/fips.h> 24 24 #include <linux/module.h> 25 25 #include <linux/once.h> 26 - #include <linux/random.h> 26 + #include <linux/prandom.h> 27 27 #include <linux/scatterlist.h> 28 28 #include <linux/slab.h> 29 29 #include <linux/string.h>
+1 -1
drivers/gpu/drm/i915/selftests/i915_gem.c
··· 4 4 * Copyright © 2018 Intel Corporation 5 5 */ 6 6 7 - #include <linux/random.h> 7 + #include <linux/prandom.h> 8 8 9 9 #include "gem/i915_gem_internal.h" 10 10 #include "gem/i915_gem_pm.h"
+1 -1
drivers/gpu/drm/i915/selftests/i915_random.h
··· 26 26 #define __I915_SELFTESTS_RANDOM_H__ 27 27 28 28 #include <linux/math64.h> 29 - #include <linux/random.h> 29 + #include <linux/prandom.h> 30 30 31 31 #include "../i915_selftest.h" 32 32
+1 -1
drivers/gpu/drm/i915/selftests/scatterlist.c
··· 22 22 */ 23 23 24 24 #include <linux/prime_numbers.h> 25 - #include <linux/random.h> 25 + #include <linux/prandom.h> 26 26 27 27 #include "i915_selftest.h" 28 28 #include "i915_utils.h"
+1 -1
drivers/gpu/drm/lib/drm_random.h
··· 6 6 * be transposed to lib/ at the earliest convenience. 7 7 */ 8 8 9 - #include <linux/random.h> 9 + #include <linux/prandom.h> 10 10 11 11 #define DRM_RND_STATE_INITIALIZER(seed__) ({ \ 12 12 struct rnd_state state__; \
+1
drivers/media/test-drivers/vivid/vivid-vid-cap.c
··· 10 10 #include <linux/sched.h> 11 11 #include <linux/vmalloc.h> 12 12 #include <linux/videodev2.h> 13 + #include <linux/prandom.h> 13 14 #include <linux/v4l2-dv-timings.h> 14 15 #include <media/v4l2-common.h> 15 16 #include <media/v4l2-event.h>
+1 -1
drivers/mtd/tests/oobtest.c
··· 17 17 #include <linux/mtd/mtd.h> 18 18 #include <linux/slab.h> 19 19 #include <linux/sched.h> 20 - #include <linux/random.h> 20 + #include <linux/prandom.h> 21 21 22 22 #include "mtd_test.h" 23 23
+1 -1
drivers/mtd/tests/pagetest.c
··· 17 17 #include <linux/mtd/mtd.h> 18 18 #include <linux/slab.h> 19 19 #include <linux/sched.h> 20 - #include <linux/random.h> 20 + #include <linux/prandom.h> 21 21 22 22 #include "mtd_test.h" 23 23
+1 -1
drivers/mtd/tests/subpagetest.c
··· 15 15 #include <linux/mtd/mtd.h> 16 16 #include <linux/slab.h> 17 17 #include <linux/sched.h> 18 - #include <linux/random.h> 18 + #include <linux/prandom.h> 19 19 20 20 #include "mtd_test.h" 21 21
+1
fs/crypto/keyring.c
··· 22 22 #include <crypto/skcipher.h> 23 23 #include <linux/key-type.h> 24 24 #include <linux/random.h> 25 + #include <linux/once.h> 25 26 #include <linux/seq_file.h> 26 27 27 28 #include "fscrypt_private.h"
+1
include/linux/prandom.h
··· 10 10 11 11 #include <linux/types.h> 12 12 #include <linux/once.h> 13 + #include <linux/percpu.h> 13 14 #include <linux/random.h> 14 15 15 16 struct rnd_state {
-7
include/linux/random.h
··· 145 145 declare_get_random_var_wait(long, unsigned long) 146 146 #undef declare_get_random_var 147 147 148 - /* 149 - * This is designed to be standalone for just prandom 150 - * users, but for now we include it from <linux/random.h> 151 - * for legacy reasons. 152 - */ 153 - #include <linux/prandom.h> 154 - 155 148 #ifdef CONFIG_SMP 156 149 int random_prepare_cpu(unsigned int cpu); 157 150 int random_online_cpu(unsigned int cpu);
+1 -1
include/scsi/libfcoe.h
··· 15 15 #include <linux/skbuff.h> 16 16 #include <linux/workqueue.h> 17 17 #include <linux/local_lock.h> 18 - #include <linux/random.h> 18 + #include <linux/prandom.h> 19 19 #include <scsi/fc/fc_fcoe.h> 20 20 #include <scsi/libfc.h> 21 21 #include <scsi/fcoe_sysfs.h>
+1 -1
kernel/bpf/core.c
··· 21 21 #include <linux/filter.h> 22 22 #include <linux/skbuff.h> 23 23 #include <linux/vmalloc.h> 24 - #include <linux/random.h> 24 + #include <linux/prandom.h> 25 25 #include <linux/bpf.h> 26 26 #include <linux/btf.h> 27 27 #include <linux/objtool.h>
+1 -1
lib/interval_tree_test.c
··· 2 2 #include <linux/module.h> 3 3 #include <linux/moduleparam.h> 4 4 #include <linux/interval_tree.h> 5 - #include <linux/random.h> 5 + #include <linux/prandom.h> 6 6 #include <linux/slab.h> 7 7 #include <asm/timex.h> 8 8
+1
lib/kunit/string-stream-test.c
··· 9 9 #include <kunit/static_stub.h> 10 10 #include <kunit/test.h> 11 11 #include <linux/ktime.h> 12 + #include <linux/prandom.h> 12 13 #include <linux/slab.h> 13 14 #include <linux/timekeeping.h> 14 15
+1 -1
lib/random32.c
··· 36 36 #include <linux/percpu.h> 37 37 #include <linux/export.h> 38 38 #include <linux/jiffies.h> 39 - #include <linux/random.h> 39 + #include <linux/prandom.h> 40 40 #include <linux/sched.h> 41 41 #include <linux/bitops.h> 42 42 #include <linux/slab.h>
+1 -1
lib/rbtree_test.c
··· 2 2 #include <linux/module.h> 3 3 #include <linux/moduleparam.h> 4 4 #include <linux/rbtree_augmented.h> 5 - #include <linux/random.h> 5 + #include <linux/prandom.h> 6 6 #include <linux/slab.h> 7 7 #include <asm/timex.h> 8 8
+1 -1
lib/test_bpf.c
··· 14 14 #include <linux/skbuff.h> 15 15 #include <linux/netdevice.h> 16 16 #include <linux/if_vlan.h> 17 - #include <linux/random.h> 17 + #include <linux/prandom.h> 18 18 #include <linux/highmem.h> 19 19 #include <linux/sched.h> 20 20
+1 -1
lib/test_parman.c
··· 39 39 #include <linux/slab.h> 40 40 #include <linux/bitops.h> 41 41 #include <linux/err.h> 42 - #include <linux/random.h> 42 + #include <linux/prandom.h> 43 43 #include <linux/parman.h> 44 44 45 45 #define TEST_PARMAN_PRIO_SHIFT 7 /* defines number of prios for testing */
+1 -1
lib/test_scanf.c
··· 11 11 #include <linux/module.h> 12 12 #include <linux/overflow.h> 13 13 #include <linux/printk.h> 14 - #include <linux/random.h> 14 + #include <linux/prandom.h> 15 15 #include <linux/slab.h> 16 16 #include <linux/string.h> 17 17
+1
net/sched/sch_netem.c
··· 17 17 #include <linux/errno.h> 18 18 #include <linux/skbuff.h> 19 19 #include <linux/vmalloc.h> 20 + #include <linux/prandom.h> 20 21 #include <linux/rtnetlink.h> 21 22 #include <linux/reciprocal_div.h> 22 23 #include <linux/rbtree.h>