projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
[cascardo/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
af310af
..
edee99f
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-76,6
+76,7
@@
#include <linux/elevator.h>
#include <linux/sched_clock.h>
#include <linux/context_tracking.h>
#include <linux/elevator.h>
#include <linux/sched_clock.h>
#include <linux/context_tracking.h>
+#include <linux/random.h>
#include <asm/io.h>
#include <asm/bugs.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@
-135,6
+136,13
@@
static char *static_command_line;
static char *execute_command;
static char *ramdisk_execute_command;
static char *execute_command;
static char *ramdisk_execute_command;
+/*
+ * Used to generate warnings if static_key manipulation functions are used
+ * before jump_label_init is called.
+ */
+bool static_key_initialized __read_mostly = false;
+EXPORT_SYMBOL_GPL(static_key_initialized);
+
/*
* If set, this is an indication to the drivers that reset the underlying
* device before going ahead with the initialization otherwise driver might
/*
* If set, this is an indication to the drivers that reset the underlying
* device before going ahead with the initialization otherwise driver might
@@
-780,6
+788,7
@@
static void __init do_basic_setup(void)
do_ctors();
usermodehelper_enable();
do_initcalls();
do_ctors();
usermodehelper_enable();
do_initcalls();
+ random_int_secret_init();
}
static void __init do_pre_smp_initcalls(void)
}
static void __init do_pre_smp_initcalls(void)