projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "powerpc/e500: Update compilation flags with core specific options"
[cascardo/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
ec54958
..
d03d2ec
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-74,6
+74,7
@@
#include <linux/ptrace.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
#include <linux/ptrace.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
+#include <linux/sched_clock.h>
#include <asm/io.h>
#include <asm/bugs.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@
-554,6
+555,7
@@
asmlinkage void __init start_kernel(void)
softirq_init();
timekeeping_init();
time_init();
softirq_init();
timekeeping_init();
time_init();
+ sched_clock_postinit();
perf_event_init();
profile_init();
call_function_init();
perf_event_init();
profile_init();
call_function_init();
@@
-655,8
+657,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
+679,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);