History

Merge branch 'linus' into sched/core, to pick up fixes

Ingo Molnar committed 9 years ago

Commit 8a103df2 parents a9903f0 fbc3edf13316 files · +20939 −4698Browse files

Showing the changes to init (9 of 13316 files). Show all

Unified · Split

9 files
  1. init/Kconfig +1 −1
  2. init/Makefile +1 −0
  3. init/calibrate.c +1 −0
  4. init/do_mounts.h +1 −0
  5. init/do_mounts_initrd.c +1 −0
  6. init/do_mounts_md.c +1 −0
  7. init/do_mounts_rd.c +1 −0
  8. init/init_task.c +1 −0
  9. init/initramfs.c +1 −0
init/Kconfig+1−1
@@ -1040,7 +1040,7 @@ endif · 1039 unmodified lines
10401040
10411041 choice
10421042 prompt "Compiler optimization level"
1043− default CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
1043+ default CC_OPTIMIZE_FOR_PERFORMANCE
10441044
10451045 config CC_OPTIMIZE_FOR_PERFORMANCE
10461046 bool "Optimize for performance"
init/Makefile+1−0
@@ -1,3 +1,4 @@
1+# SPDX-License-Identifier: GPL-2.0
12 #
23 # Makefile for the linux kernel.
34 #
init/calibrate.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 /* calibrate.c: default delay calibration
23 *
34 * Excised from init/main.c
init/do_mounts.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #include <linux/kernel.h>
23 #include <linux/blkdev.h>
34 #include <linux/init.h>
init/do_mounts_initrd.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 /*
23 * Many of the syscalls used in this file expect some of the arguments
34 * to be __user pointers not __kernel pointers. To limit the sparse
init/do_mounts_md.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 /*
23 * Many of the syscalls used in this file expect some of the arguments
34 * to be __user pointers not __kernel pointers. To limit the sparse
init/do_mounts_rd.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 /*
23 * Many of the syscalls used in this file expect some of the arguments
34 * to be __user pointers not __kernel pointers. To limit the sparse
init/init_task.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 #include <linux/init_task.h>
23 #include <linux/export.h>
34 #include <linux/mqueue.h>
init/initramfs.c+1−0
@@ -1,3 +1,4 @@
1+// SPDX-License-Identifier: GPL-2.0
12 /*
23 * Many of the syscalls used in this file expect some of the arguments
34 * to be __user pointers not __kernel pointers. To limit the sparse