diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 | ||||
-rw-r--r-- | init/main.c | 1 | ||||
-rw-r--r-- | init/version.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 1a207efca591..675d8a2326cf 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1069,11 +1069,9 @@ config UIDGID_CONVERTED | |||
1069 | # Filesystems | 1069 | # Filesystems |
1070 | depends on 9P_FS = n | 1070 | depends on 9P_FS = n |
1071 | depends on AFS_FS = n | 1071 | depends on AFS_FS = n |
1072 | depends on AUTOFS4_FS = n | ||
1073 | depends on CEPH_FS = n | 1072 | depends on CEPH_FS = n |
1074 | depends on CIFS = n | 1073 | depends on CIFS = n |
1075 | depends on CODA_FS = n | 1074 | depends on CODA_FS = n |
1076 | depends on FUSE_FS = n | ||
1077 | depends on GFS2_FS = n | 1075 | depends on GFS2_FS = n |
1078 | depends on NCP_FS = n | 1076 | depends on NCP_FS = n |
1079 | depends on NFSD = n | 1077 | depends on NFSD = n |
diff --git a/init/main.c b/init/main.c index 63ae904a99a8..baf1f0f5c461 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -812,7 +812,6 @@ static int __ref kernel_init(void *unused) | |||
812 | system_state = SYSTEM_RUNNING; | 812 | system_state = SYSTEM_RUNNING; |
813 | numa_default_policy(); | 813 | numa_default_policy(); |
814 | 814 | ||
815 | current->signal->flags |= SIGNAL_UNKILLABLE; | ||
816 | flush_delayed_fput(); | 815 | flush_delayed_fput(); |
817 | 816 | ||
818 | if (ramdisk_execute_command) { | 817 | if (ramdisk_execute_command) { |
diff --git a/init/version.c b/init/version.c index 86fe0ccb997a..58170f18912d 100644 --- a/init/version.c +++ b/init/version.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/utsname.h> | 12 | #include <linux/utsname.h> |
13 | #include <generated/utsrelease.h> | 13 | #include <generated/utsrelease.h> |
14 | #include <linux/version.h> | 14 | #include <linux/version.h> |
15 | #include <linux/proc_fs.h> | ||
15 | 16 | ||
16 | #ifndef CONFIG_KALLSYMS | 17 | #ifndef CONFIG_KALLSYMS |
17 | #define version(a) Version_ ## a | 18 | #define version(a) Version_ ## a |
@@ -34,6 +35,7 @@ struct uts_namespace init_uts_ns = { | |||
34 | .domainname = UTS_DOMAINNAME, | 35 | .domainname = UTS_DOMAINNAME, |
35 | }, | 36 | }, |
36 | .user_ns = &init_user_ns, | 37 | .user_ns = &init_user_ns, |
38 | .proc_inum = PROC_UTS_INIT_INO, | ||
37 | }; | 39 | }; |
38 | EXPORT_SYMBOL_GPL(init_uts_ns); | 40 | EXPORT_SYMBOL_GPL(init_uts_ns); |
39 | 41 | ||