Fixes the following build error and unused variable warning:
init/main.c: In function 'console_on_rootfs':
init/main.c:1487:73: error: 'console_stat' undeclared (first use in
this function); did you mean 'console_start'?
if (vfs_lstat((char __user *) "/dev/console", (struct kstat __user
*) &console_stat)
^~~~~~~~~~~~
console_start
init/main.c:1487:73: note: each undeclared identifier is reported only
once for each function it appears in
init/main.c:1493:2: warning: ISO C90 forbids mixed declarations and
code [-Wdeclaration-after-statement]
struct file *file = filp_open("/dev/console", O_RDWR, 0);
^~~~~~
init/main.c: In function 'kernel_init_freeable':
init/main.c:1508:15: warning: unused variable 'console_stat' [-Wunused-variable]
struct kstat console_stat;
^~~~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: init/main.o] Error 1
Regards,
ismail
From 6543a90794312c12f1fa85a6622817a9ee637537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= <[email protected]>
Date: Fri, 11 Jun 2021 11:20:23 +0200
Subject: [PATCH 1/1] Fix build when CONFIG_BLK_DEV_INITRD is disabled.
---
init/main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c
index 0e4cc913695e..459fe158d85b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1484,6 +1484,7 @@ void __init console_on_rootfs(void)
* In case of initrd or initramfs /dev/console might be instantiated
* later by /init so don't do this check for CONFIG_BLK_DEV_INITRD
*/
+ struct kstat console_stat;
if (vfs_lstat((char __user *) "/dev/console", (struct kstat __user *) &console_stat)
|| !S_ISCHR(console_stat.mode)) {
panic("/dev/console is missing or not a character device!\nPlease ensure your rootfs is properly configured\n");
@@ -1504,9 +1505,6 @@ void __init console_on_rootfs(void)
static noinline void __init kernel_init_freeable(void)
{
-#ifndef CONFIG_BLK_DEV_INITRD
- struct kstat console_stat;
-#endif
/*
* Wait until kthreadd is all set-up.
*/
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9954):
https://lists.yoctoproject.org/g/linux-yocto/message/9954
Mute This Topic: https://lists.yoctoproject.org/mt/83464806/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
