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
nilfs2: use refcount_dec_and_lock() to fix potential UAF
[linux-2.6-microblaze.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
8d97aba
..
4a52392
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);
@@
-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();
}