projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iommu-fixes-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index bc0f9e0bcf22460d787142db5b6dd1c4b61e5d88..eae02aa03c9e80062ba6920c57c347c415e6d0ca 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-453,7
+453,7
@@
void __init __weak smp_setup_processor_id(void)
}
# if THREAD_SIZE >= PAGE_SIZE
}
# if THREAD_SIZE >= PAGE_SIZE
-void __init __weak thread_
info
_cache_init(void)
+void __init __weak thread_
stack
_cache_init(void)
{
}
#endif
{
}
#endif
@@
-607,6
+607,7
@@
asmlinkage __visible void __init start_kernel(void)
initrd_start = 0;
}
#endif
initrd_start = 0;
}
#endif
+ page_ext_init();
debug_objects_mem_init();
kmemleak_init();
setup_per_cpu_pageset();
debug_objects_mem_init();
kmemleak_init();
setup_per_cpu_pageset();
@@
-626,7
+627,7
@@
asmlinkage __visible void __init start_kernel(void)
/* Should be run before the first non-init thread is created */
init_espfix_bsp();
#endif
/* Should be run before the first non-init thread is created */
init_espfix_bsp();
#endif
- thread_
info
_cache_init();
+ thread_
stack
_cache_init();
cred_init();
fork_init();
proc_caches_init();
cred_init();
fork_init();
proc_caches_init();
@@
-707,11
+708,13
@@
static bool __init_or_module initcall_blacklisted(initcall_t fn)
{
struct blacklist_entry *entry;
char fn_name[KSYM_SYMBOL_LEN];
{
struct blacklist_entry *entry;
char fn_name[KSYM_SYMBOL_LEN];
+ unsigned long addr;
if (list_empty(&blacklisted_initcalls))
return false;
if (list_empty(&blacklisted_initcalls))
return false;
- sprint_symbol_no_offset(fn_name, (unsigned long)fn);
+ addr = (unsigned long) dereference_function_descriptor(fn);
+ sprint_symbol_no_offset(fn_name, addr);
list_for_each_entry(entry, &blacklisted_initcalls, next) {
if (!strcmp(fn_name, entry->buf)) {
list_for_each_entry(entry, &blacklisted_initcalls, next) {
if (!strcmp(fn_name, entry->buf)) {
@@
-1003,8
+1006,6
@@
static noinline void __init kernel_init_freeable(void)
sched_init_smp();
page_alloc_init_late();
sched_init_smp();
page_alloc_init_late();
- /* Initialize page ext after all struct pages are initializaed */
- page_ext_init();
do_basic_setup();
do_basic_setup();
This page took
0.028457 seconds
and
5
git commands to generate.