diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-25 22:46:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:12 -0400 |
commit | f56f6d30c75984d0aba2656eaeb35f3806395191 (patch) | |
tree | e33a35337b04f0e7bd8cd58593f49369818084ea | |
parent | 9580d85f9cdb076c4bfb467bc6c0d3c5e499957a (diff) |
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>
-rw-r--r-- | init/do_mounts.c | 2 | ||||
-rw-r--r-- | init/do_mounts.h | 1 |
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 @@ | |||
23 | int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ | 23 | int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ |
24 | 24 | ||
25 | int root_mountflags = MS_RDONLY | MS_SILENT; | 25 | int root_mountflags = MS_RDONLY | MS_SILENT; |
26 | char * __initdata root_device_name; | 26 | static char * __initdata root_device_name; |
27 | static char __initdata saved_root_name[64]; | 27 | static char __initdata saved_root_name[64]; |
28 | static int __initdata root_wait; | 28 | static int __initdata root_wait; |
29 | 29 | ||
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, ...); | |||
11 | void mount_block_root(char *name, int flags); | 11 | void mount_block_root(char *name, int flags); |
12 | void mount_root(void); | 12 | void mount_root(void); |
13 | extern int root_mountflags; | 13 | extern int root_mountflags; |
14 | extern char *root_device_name; | ||
15 | 14 | ||
16 | static inline int create_dev(char *name, dev_t dev) | 15 | static inline int create_dev(char *name, dev_t dev) |
17 | { | 16 | { |