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

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

However, the upstream commit d55535232c ("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>

2023-06-29 09:26:46 +09:00

..

calibrate.c

kernel: add calibration_delay_done()

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

do_mounts_dm.c

ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.

2017-06-05 11:26:17 -04: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: wait emmc ready before root

2018-08-19 19:12:34 -07:00

do_mounts.h

CHROMIUM: dm: boot time specification of dm=

2017-01-27 13:55:15 -08:00

init_task.c

sched/core: Allow putting thread_info into task_struct

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

initramfs.c

ANDROID: initramfs: call free_initrd() when skipping init

2017-12-05 18:05:48 +00:00

Kconfig

bpf: Add kconfig knob for disabling unpriv bpf by default

2023-05-16 12:42:13 +09:00

main.c

random: only call boot_init_stack_canary() once

2023-06-29 09:26:46 +09:00

Makefile

CHROMIUM: dm: boot time specification of dm=

2017-01-27 13:55:15 -08:00

noinitramfs.c

ANDROID: initramfs: Add skip_initramfs command line option

2017-01-27 13:52:19 -08:00

version.c

UPSTREAM: locking/atomic, kref: Add KREF_INIT()

2023-05-16 10:25:44 +09:00