projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'md-3.11' of git://neil.brown.name/md
[firefly-linux-kernel-4.4.55.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 9484f4ba88d05aa589bb737d96836a1a01db55ce..f2366533c922de7a49f1f9beee6b977603bdaaf2 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-542,7
+542,6
@@
asmlinkage void __init start_kernel(void)
if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n"))
local_irq_disable();
idr_init_cache();
if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n"))
local_irq_disable();
idr_init_cache();
- perf_event_init();
rcu_init();
tick_nohz_init();
radix_tree_init();
rcu_init();
tick_nohz_init();
radix_tree_init();
@@
-555,6
+554,7
@@
asmlinkage void __init start_kernel(void)
softirq_init();
timekeeping_init();
time_init();
softirq_init();
timekeeping_init();
time_init();
+ perf_event_init();
profile_init();
call_function_init();
WARN(!irqs_disabled(), "Interrupts were enabled early\n");
profile_init();
call_function_init();
WARN(!irqs_disabled(), "Interrupts were enabled early\n");
@@
-655,8
+655,6
@@
static void __init do_ctors(void)
bool initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);
bool initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);
-static char msgbuf[64];
-
static int __init_or_module do_one_initcall_debug(initcall_t fn)
{
ktime_t calltime, delta, rettime;
static int __init_or_module do_one_initcall_debug(initcall_t fn)
{
ktime_t calltime, delta, rettime;
@@
-679,6
+677,7
@@
int __init_or_module do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;
{
int count = preempt_count();
int ret;
+ char msgbuf[64];
if (initcall_debug)
ret = do_one_initcall_debug(fn);
if (initcall_debug)
ret = do_one_initcall_debug(fn);