aboutsummaryrefslogtreecommitdiff
path: root/init/do_mounts.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-09-17 10:00:46 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-09-17 10:00:46 +0200
commit6d0aed7a38d06284db2a0e46c0a072b0c1c3299b (patch)
treef0c59524517fdd0ab384ac65c60bed305ebc77c8 /init/do_mounts.c
parent01ea50638bc04ca5259f5711fcdedefcdde1cf43 (diff)
downloadlinux-aarch64-6d0aed7a38d06284db2a0e46c0a072b0c1c3299b.tar.gz
do_mounts: only enable PARTUUID for CONFIG_BLOCK
When CONFIG_BLOCK is not enabled: init/do_mounts.c:71: error: implicit declaration of function 'dev_to_part' init/do_mounts.c:71: warning: initialization makes pointer from integer without a cast init/do_mounts.c:73: error: dereferencing pointer to incomplete type init/do_mounts.c:76: error: dereferencing pointer to incomplete type init/do_mounts.c:76: error: dereferencing pointer to incomplete type init/do_mounts.c:102: error: implicit declaration of function 'part_pack_uuid' init/do_mounts.c:104: error: 'block_class' undeclared (first use in this function) Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'init/do_mounts.c')
-rw-r--r--init/do_mounts.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index b7fc83994f39..42db0551c3aa 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -58,6 +58,7 @@ static int __init readwrite(char *str)
__setup("ro", readonly);
__setup("rw", readwrite);
+#ifdef CONFIG_BLOCK
/**
* match_dev_by_uuid - callback for finding a partition using its uuid
* @dev: device passed in by the caller
@@ -111,6 +112,7 @@ static dev_t __init devt_from_partuuid(char *uuid_str)
done:
return res;
}
+#endif
/*
* Convert a name into device number. We accept the following variants:
@@ -138,6 +140,7 @@ dev_t name_to_dev_t(char *name)
dev_t res = 0;
int part;
+#ifdef CONFIG_BLOCK
if (strncmp(name, "PARTUUID=", 9) == 0) {
name += 9;
if (strlen(name) != 36)
@@ -147,6 +150,7 @@ dev_t name_to_dev_t(char *name)
goto fail;
goto done;
}
+#endif
if (strncmp(name, "/dev/", 5) != 0) {
unsigned maj, min;