Hans-Christian Noren Egtvedt f0c556f4b0 random: only call boot_init_stack_canary() once ...

In commit 166a592cad36 ("random: move rand_initialize() earlier") the
boot_init_stack_canary() call was added after the new random_init()
call.

However, the upstream commit d55535232c3d ("random: move
rand_initialize() earlier") also included removing the earlier call to
boot_init_stack_canary(), making sure this call is done after
random_init().

Hence fix what I assume is a wrong merge conflict resolution on the
linux-4.9.y stable branch.

Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2022-08-25 11:09:22 +02:00

..

calibrate.c

kernel: add calibration_delay_done()

2014-06-16 12:47:39 -06:00

do_mounts_initrd.c

init/do_mounts: initrd_load() can be boolean

2016-01-20 17:09:18 -08:00

do_mounts_md.c

init: disable sparse checking of the mount.o source files

2012-05-31 17:49:27 -07:00

do_mounts_rd.c

init: use pr_cont() when displaying rotator during ramdisk loading.

2016-11-24 09:32:20 -08:00

do_mounts.c

init/do_mounts.c: add create_dev() failure log

2015-06-25 17:00:42 -07:00

do_mounts.h

init/do_mounts: initrd_load() can be boolean

2016-01-20 17:09:18 -08:00

init_task.c

sched/core: Allow putting thread_info into task_struct

2016-09-15 08:25:13 +02:00

initramfs.c

initramfs: finish fput() before accessing any binary from initramfs

2017-10-21 17:21:33 +02:00

Kconfig

bpf: Add kconfig knob for disabling unpriv bpf by default

2022-02-16 12:43:54 +01:00

main.c

random: only call boot_init_stack_canary() once

2022-08-25 11:09:22 +02:00

Makefile

kbuild: allow archs to select link dead code/data elimination

2016-09-09 10:47:00 +02:00

noinitramfs.c

…

version.c

copy address of proc_ns_ops into ns_common

2014-12-04 14:34:47 -05:00