diff options
author | Linus Torvalds | 2017-02-28 01:09:29 -0600 |
---|---|---|
committer | Linus Torvalds | 2017-02-28 01:09:29 -0600 |
commit | 86292b33d4b79ee03e2f43ea0381ef85f077c760 (patch) | |
tree | b69a6ffd8ec5ac01599d351205a96804b9c415da /init | |
parent | 1ac884f173d4842216f6a24c03c9833e3ce6e982 (diff) | |
parent | 3e761a42e19c63b624ebac94d918d8a15e07e2a7 (diff) | |
download | kernel-86292b33d4b79ee03e2f43ea0381ef85f077c760.tar.gz kernel-86292b33d4b79ee03e2f43ea0381ef85f077c760.tar.xz kernel-86292b33d4b79ee03e2f43ea0381ef85f077c760.zip |
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton:
- a few MM remainders
- misc things
- autofs updates
- signals
- affs updates
- ipc
- nilfs2
- spelling.txt updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
mm: add arch-independent testcases for RODATA
hfs: atomically read inode size
mm: clarify mm_struct.mm_{users,count} documentation
mm: use mmget_not_zero() helper
mm: add new mmget() helper
mm: add new mmgrab() helper
checkpatch: warn when formats use %Z and suggest %z
lib/vsprintf.c: remove %Z support
scripts/spelling.txt: add some typo-words
scripts/spelling.txt: add "followings" pattern and fix typo instances
scripts/spelling.txt: add "therfore" pattern and fix typo instances
scripts/spelling.txt: add "overwriten" pattern and fix typo instances
scripts/spelling.txt: add "overwritting" pattern and fix typo instances
scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
scripts/spelling.txt: add "disassocation" pattern and fix typo instances
scripts/spelling.txt: add "omited" pattern and fix typo instances
scripts/spelling.txt: add "explictely" pattern and fix typo instances
scripts/spelling.txt: add "applys" pattern and fix typo instances
scripts/spelling.txt: add "configuartion" pattern and fix typo instances
...
Diffstat (limited to 'init')
-rw-r--r-- | init/initramfs.c | 2 | ||||
-rw-r--r-- | init/main.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index b32ad7d97ac9..981f286c1d16 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/dirent.h> | 18 | #include <linux/dirent.h> |
19 | #include <linux/syscalls.h> | 19 | #include <linux/syscalls.h> |
20 | #include <linux/utime.h> | 20 | #include <linux/utime.h> |
21 | #include <linux/file.h> | ||
21 | 22 | ||
22 | static ssize_t __init xwrite(int fd, const char *p, size_t count) | 23 | static ssize_t __init xwrite(int fd, const char *p, size_t count) |
23 | { | 24 | { |
@@ -647,6 +648,7 @@ static int __init populate_rootfs(void) | |||
647 | printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); | 648 | printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); |
648 | free_initrd(); | 649 | free_initrd(); |
649 | #endif | 650 | #endif |
651 | flush_delayed_fput(); | ||
650 | /* | 652 | /* |
651 | * Try loading default modules from initramfs. This gives | 653 | * Try loading default modules from initramfs. This gives |
652 | * us a chance to load before device_initcalls. | 654 | * us a chance to load before device_initcalls. |
diff --git a/init/main.c b/init/main.c index 24ea48745061..47ea22d181ef 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -71,7 +71,6 @@ | |||
71 | #include <linux/shmem_fs.h> | 71 | #include <linux/shmem_fs.h> |
72 | #include <linux/slab.h> | 72 | #include <linux/slab.h> |
73 | #include <linux/perf_event.h> | 73 | #include <linux/perf_event.h> |
74 | #include <linux/file.h> | ||
75 | #include <linux/ptrace.h> | 74 | #include <linux/ptrace.h> |
76 | #include <linux/blkdev.h> | 75 | #include <linux/blkdev.h> |
77 | #include <linux/elevator.h> | 76 | #include <linux/elevator.h> |
@@ -83,6 +82,7 @@ | |||
83 | #include <linux/proc_ns.h> | 82 | #include <linux/proc_ns.h> |
84 | #include <linux/io.h> | 83 | #include <linux/io.h> |
85 | #include <linux/cache.h> | 84 | #include <linux/cache.h> |
85 | #include <linux/rodata_test.h> | ||
86 | 86 | ||
87 | #include <asm/io.h> | 87 | #include <asm/io.h> |
88 | #include <asm/bugs.h> | 88 | #include <asm/bugs.h> |
@@ -936,9 +936,10 @@ __setup("rodata=", set_debug_rodata); | |||
936 | #ifdef CONFIG_STRICT_KERNEL_RWX | 936 | #ifdef CONFIG_STRICT_KERNEL_RWX |
937 | static void mark_readonly(void) | 937 | static void mark_readonly(void) |
938 | { | 938 | { |
939 | if (rodata_enabled) | 939 | if (rodata_enabled) { |
940 | mark_rodata_ro(); | 940 | mark_rodata_ro(); |
941 | else | 941 | rodata_test(); |
942 | } else | ||
942 | pr_info("Kernel memory protection disabled.\n"); | 943 | pr_info("Kernel memory protection disabled.\n"); |
943 | } | 944 | } |
944 | #else | 945 | #else |
@@ -960,8 +961,6 @@ static int __ref kernel_init(void *unused) | |||
960 | system_state = SYSTEM_RUNNING; | 961 | system_state = SYSTEM_RUNNING; |
961 | numa_default_policy(); | 962 | numa_default_policy(); |
962 | 963 | ||
963 | flush_delayed_fput(); | ||
964 | |||
965 | rcu_end_inkernel_boot(); | 964 | rcu_end_inkernel_boot(); |
966 | 965 | ||
967 | if (ramdisk_execute_command) { | 966 | if (ramdisk_execute_command) { |