aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-01-23 01:48:28 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-28 21:58:26 +0100
commit764b1ecb69038c10009f82ecfdf5809d391b6226 (patch)
treeb1fac8418423bf3955db6565e77d96a5bcc6d50a /target/linux
parentfcb29171bc9a3a80c2685ef23ba6552abef04bbb (diff)
downloadupstream-764b1ecb69038c10009f82ecfdf5809d391b6226.tar.gz
upstream-764b1ecb69038c10009f82ecfdf5809d391b6226.tar.bz2
upstream-764b1ecb69038c10009f82ecfdf5809d391b6226.zip
kernel: Fix compile warning
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/pending-5.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch6
-rw-r--r--target/linux/generic/pending-5.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch6
2 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-5.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index af65cbfa59..e3c4dd2ef4 100644
--- a/target/linux/generic/pending-5.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/pending-5.10/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -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
diff --git a/target/linux/generic/pending-5.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/pending-5.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
index aa61f4ae8d..e207c0d00d 100644
--- a/target/linux/generic/pending-5.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
+++ b/target/linux/generic/pending-5.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch
@@ -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