diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 16:00:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 16:00:36 -0500 |
commit | 78a45c6f067824cf5d0a9fedea7339ac2e28603c (patch) | |
tree | b4f78c8b6b9059ddace0a18c11629b8d2045f793 /init/main.c | |
parent | f96fe225677b3efb74346ebd56fafe3997b02afa (diff) | |
parent | 29d293b6007b91a4463f05bc8d0b26e0e65c5816 (diff) |
Merge branch 'akpm' (second patch-bomb from Andrew)
Merge second patchbomb from Andrew Morton:
- the rest of MM
- misc fs fixes
- add execveat() syscall
- new ratelimit feature for fault-injection
- decompressor updates
- ipc/ updates
- fallocate feature creep
- fsnotify cleanups
- a few other misc things
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (99 commits)
cgroups: Documentation: fix trivial typos and wrong paragraph numberings
parisc: percpu: update comments referring to __get_cpu_var
percpu: update local_ops.txt to reflect this_cpu operations
percpu: remove __get_cpu_var and __raw_get_cpu_var macros
fsnotify: remove destroy_list from fsnotify_mark
fsnotify: unify inode and mount marks handling
fallocate: create FAN_MODIFY and IN_MODIFY events
mm/cma: make kmemleak ignore CMA regions
slub: fix cpuset check in get_any_partial
slab: fix cpuset check in fallback_alloc
shmdt: use i_size_read() instead of ->i_size
ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments
ipc/msg: increase MSGMNI, remove scaling
ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
ipc/sem.c: change memory barrier in sem_lock() to smp_rmb()
lib/decompress.c: consistency of compress formats for kernel image
decompress_bunzip2: off by one in get_next_block()
usr/Kconfig: make initrd compression algorithm selection not expert
fault-inject: add ratelimit option
ratelimit: add initialization macro
...
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index ca380ec685de..ed7e7ad5fee0 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include <linux/mempolicy.h> | 51 | #include <linux/mempolicy.h> |
52 | #include <linux/key.h> | 52 | #include <linux/key.h> |
53 | #include <linux/buffer_head.h> | 53 | #include <linux/buffer_head.h> |
54 | #include <linux/page_ext.h> | ||
54 | #include <linux/debug_locks.h> | 55 | #include <linux/debug_locks.h> |
55 | #include <linux/debugobjects.h> | 56 | #include <linux/debugobjects.h> |
56 | #include <linux/lockdep.h> | 57 | #include <linux/lockdep.h> |
@@ -484,6 +485,11 @@ void __init __weak thread_info_cache_init(void) | |||
484 | */ | 485 | */ |
485 | static void __init mm_init(void) | 486 | static void __init mm_init(void) |
486 | { | 487 | { |
488 | /* | ||
489 | * page_ext requires contiguous pages, | ||
490 | * bigger than MAX_ORDER unless SPARSEMEM. | ||
491 | */ | ||
492 | page_ext_init_flatmem(); | ||
487 | mem_init(); | 493 | mem_init(); |
488 | kmem_cache_init(); | 494 | kmem_cache_init(); |
489 | percpu_init_late(); | 495 | percpu_init_late(); |
@@ -621,6 +627,7 @@ asmlinkage __visible void __init start_kernel(void) | |||
621 | initrd_start = 0; | 627 | initrd_start = 0; |
622 | } | 628 | } |
623 | #endif | 629 | #endif |
630 | page_ext_init(); | ||
624 | debug_objects_mem_init(); | 631 | debug_objects_mem_init(); |
625 | kmemleak_init(); | 632 | kmemleak_init(); |
626 | setup_per_cpu_pageset(); | 633 | setup_per_cpu_pageset(); |