summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-26 06:46:25 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 23:00:12 +0400
commitf56f6d30c75984d0aba2656eaeb35f3806395191 (patch)
treee33a35337b04f0e7bd8cd58593f49369818084ea /init
parent9580d85f9cdb076c4bfb467bc6c0d3c5e499957a (diff)
downloadlinux-f56f6d30c75984d0aba2656eaeb35f3806395191.tar.xz
make init/do_mounts.c:root_device_name static
This patch makes the needlessly global root_device_name static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c2
-rw-r--r--init/do_mounts.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index f769fac4f4c0..3715feb8446d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -23,7 +23,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 735705d137ff..9aa968d54329 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)
{