@@ -8,12 +8,13 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -474,7 +474,28 @@ retry:
+@@ -474,7 +474,30 @@ retry:
out:
put_page(page);
}
-
+
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
+static int __init mount_ubi_rootfs(void)
+{
+ int flags = MS_SILENT;
@@ -34,11 +35,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+
+ return -EINVAL;
+}
++#endif
+
#ifdef CONFIG_ROOT_NFS
#define NFSROOT_TIMEOUT_MIN 5
-@@ -567,6 +588,10 @@ void __init mount_root(void)
+@@ -567,6 +590,10 @@ void __init mount_root(void)
return;
}
#endif
@@ -8,12 +8,13 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -460,7 +460,28 @@ retry:
+@@ -460,7 +460,30 @@ retry:
out:
put_page(page);
}
-
+
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
+static int __init mount_ubi_rootfs(void)
+{
+ int flags = MS_SILENT;
@@ -34,11 +35,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+
+ return -EINVAL;
+}
++#endif
+
#ifdef CONFIG_ROOT_NFS
#define NFSROOT_TIMEOUT_MIN 5
-@@ -554,6 +575,10 @@ void __init mount_root(void)
+@@ -554,6 +577,10 @@ void __init mount_root(void)
change_floppy("root floppy");
}
#endif
This fixes the following compile warning: CC init/do_mounts.o init/do_mounts.c:478:19: warning: 'mount_ubi_rootfs' defined but not used [-Wunused-function] 478 | static int __init mount_ubi_rootfs(void) | ^~~~~~~~~~~~~~~~ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- ...-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 6 ++++-- ...-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)