projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-microblaze.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
8d97aba
..
733e147
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-777,6
+777,8
@@
void __init __weak poking_init(void) { }
void __init __weak pgtable_cache_init(void) { }
void __init __weak pgtable_cache_init(void) { }
+void __init __weak trap_init(void) { }
+
bool initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);
bool initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);
@@
-1226,7
+1228,7
@@
trace_initcall_start_cb(void *data, initcall_t fn)
{
ktime_t *calltime = (ktime_t *)data;
{
ktime_t *calltime = (ktime_t *)data;
- printk(KERN_DEBUG "calling %pS @ %i
\n", fn, task_pid_nr(current
));
+ printk(KERN_DEBUG "calling %pS @ %i
irqs_disabled() %d\n", fn, task_pid_nr(current), irqs_disabled(
));
*calltime = ktime_get();
}
*calltime = ktime_get();
}
@@
-1240,8
+1242,8
@@
trace_initcall_finish_cb(void *data, initcall_t fn, int ret)
rettime = ktime_get();
delta = ktime_sub(rettime, *calltime);
duration = (unsigned long long) ktime_to_ns(delta) >> 10;
rettime = ktime_get();
delta = ktime_sub(rettime, *calltime);
duration = (unsigned long long) ktime_to_ns(delta) >> 10;
- printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n",
- fn, ret, duration);
+ printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs
, irqs_disabled() %d
\n",
+ fn, ret, duration
, irqs_disabled()
);
}
static ktime_t initcall_calltime;
}
static ktime_t initcall_calltime;
@@
-1392,7
+1394,6
@@
static void __init do_basic_setup(void)
driver_init();
init_irq_proc();
do_ctors();
driver_init();
init_irq_proc();
do_ctors();
- usermodehelper_enable();
do_initcalls();
}
do_initcalls();
}