xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2020-01-06 07:51:15 +01:00
parent 28336be568 c79f46a282
commit 31c7ac388a
197 changed files with 1382 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
init/main.c
View File

@@ -93,7 +93,6 @@
#include <linux/rodata_test.h>
#include <linux/jump_label.h>
#include <linux/mem_encrypt.h>
#include <linux/file.h>
#include <linux/kcsan.h>
#include <asm/io.h>
@@ -1160,26 +1159,13 @@ static int __ref kernel_init(void *unused)
void console_on_rootfs(void)
{
struct file *file;
unsigned int i;
/* Open the /dev/console as stdin, this should never fail */
if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
/* Open /dev/console in kernelspace, this should never fail */
file = filp_open("/dev/console", O_RDWR, 0);
if (IS_ERR(file))
goto err_out;
/* create stdin/stdout/stderr, this should never fail */
for (i = 0; i < 3; i++) {
if (f_dupfd(i, file, 0) != i)
goto err_out;
}
return;
err_out:
/* no panic -- this might not be fatal */
pr_err("Warning: unable to open an initial console.\n");
return;
/* create stdout/stderr */
(void) ksys_dup(0);
(void) ksys_dup(0);
}
static noinline void __init kernel_init_freeable(void)