diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-05 12:16:18 -0500 |
commit | a65981109f294ba7e64b33ad3b4575a4636fce66 (patch) | |
tree | 1061a49f11544e18775630938a8bc53920fa0421 /init/main.c | |
parent | 3fed6ae4b027f9c93be18520f87bd06bdffd196b (diff) | |
parent | b685a7350ae76bc0f388e24b36d06a63776c68ee (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
- procfs updates
- various misc bits
- lib/ updates
- epoll updates
- autofs
- fatfs
- a few more MM bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
mm/page_io.c: fix polled swap page in
checkpatch: add Co-developed-by to signature tags
docs: fix Co-Developed-by docs
drivers/base/platform.c: kmemleak ignore a known leak
fs: don't open code lru_to_page()
fs/: remove caller signal_pending branch predictions
mm/: remove caller signal_pending branch predictions
arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
kernel/sched/: remove caller signal_pending branch predictions
kernel/locking/mutex.c: remove caller signal_pending branch predictions
mm: select HAVE_MOVE_PMD on x86 for faster mremap
mm: speed up mremap by 20x on large regions
mm: treewide: remove unused address argument from pte_alloc functions
initramfs: cleanup incomplete rootfs
scripts/gdb: fix lx-version string output
kernel/kcov.c: mark write_comp_data() as notrace
kernel/sysctl: add panic_print into sysctl
panic: add options to print system info when panic happens
bfs: extra sanity checking and static inode bitmap
exec: separate MM_ANONPAGES and RLIMIT_STACK accounting
...
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 86d894852bef..e2e80ca3165a 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -105,7 +105,6 @@ | |||
105 | static int kernel_init(void *); | 105 | static int kernel_init(void *); |
106 | 106 | ||
107 | extern void init_IRQ(void); | 107 | extern void init_IRQ(void); |
108 | extern void fork_init(void); | ||
109 | extern void radix_tree_init(void); | 108 | extern void radix_tree_init(void); |
110 | 109 | ||
111 | /* | 110 | /* |
@@ -930,7 +929,7 @@ static initcall_entry_t *initcall_levels[] __initdata = { | |||
930 | }; | 929 | }; |
931 | 930 | ||
932 | /* Keep these in sync with initcalls in include/linux/init.h */ | 931 | /* Keep these in sync with initcalls in include/linux/init.h */ |
933 | static char *initcall_level_names[] __initdata = { | 932 | static const char *initcall_level_names[] __initdata = { |
934 | "pure", | 933 | "pure", |
935 | "core", | 934 | "core", |
936 | "postcore", | 935 | "postcore", |