2008-03-01 16:21:42

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] make init/do_mounts.c:root_device_name static

This patch makes the needlessly global root_device_name static.

Signed-off-by: Adrian Bunk <[email protected]>

---

init/do_mounts.c | 2 +-
init/do_mounts.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)

eab4ea6c40eb148a52a4cbbb8523b203a379c20c foobar
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3885e70..56e3b17 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -22,7 +22,7 @@
int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */

int root_mountflags = MS_RDONLY | MS_SILENT;
-char * __initdata root_device_name;
+static char * __initdata root_device_name;
static char __initdata saved_root_name[64];
static int __initdata root_wait;

diff --git a/init/do_mounts.h b/init/do_mounts.h
index 735705d..9aa968d 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -11,7 +11,6 @@ void change_floppy(char *fmt, ...);
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
-extern char *root_device_name;

static inline int create_dev(char *name, dev_t dev)
{