[klibc] [PATCH 15/16] Drop unused argument root_dev to ramdisk_load()

Mike Waychison mikew at google.com
Mon Mar 1 23:46:45 PST 2010


This argument isn't used and can be removed.

Signed-off-by: Mike Waychison <mikew at google.com>
---
 usr/kinit/do_mounts.c    |    2 +-
 usr/kinit/kinit.h        |    2 +-
 usr/kinit/ramdisk_load.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/kinit/do_mounts.c b/usr/kinit/do_mounts.c
index 9daa006..967e881 100644
--- a/usr/kinit/do_mounts.c
+++ b/usr/kinit/do_mounts.c
@@ -213,7 +213,7 @@ int do_mounts(int argc, char *argv[])
 	}
 
 	if (load_ramdisk && atoi(load_ramdisk)) {
-		if (ramdisk_load(argc, argv, root_dev))
+		if (ramdisk_load(argc, argv))
 			root_dev = Root_RAM0;
 	}
 
diff --git a/usr/kinit/kinit.h b/usr/kinit/kinit.h
index 895f920..3a37951 100644
--- a/usr/kinit/kinit.h
+++ b/usr/kinit/kinit.h
@@ -11,7 +11,7 @@
 
 int do_mounts(int argc, char *argv[]);
 int mount_nfs_root(int argc, char *argv[], int flags);
-int ramdisk_load(int argc, char *argv[], dev_t root_dev);
+int ramdisk_load(int argc, char *argv[]);
 void md_run(int argc, char *argv[]);
 const char *bdevname(dev_t dev);
 
diff --git a/usr/kinit/ramdisk_load.c b/usr/kinit/ramdisk_load.c
index 9d2e0b9..3995e8f 100644
--- a/usr/kinit/ramdisk_load.c
+++ b/usr/kinit/ramdisk_load.c
@@ -189,7 +189,7 @@ load_ramdisk_raw(const char *devpath, FILE * wfd, off_t ramdisk_start,
 	return !!fssize;
 }
 
-int ramdisk_load(int argc, char *argv[], dev_t root_dev)
+int ramdisk_load(int argc, char *argv[])
 {
 	const char *arg_prompt_ramdisk = get_arg(argc, argv, "prompt_ramdisk=");
 	const char *arg_ramdisk_blocksize =



More information about the klibc mailing list