x86, setup: reorganize the early console setup

[net-next-2.6.git] / arch / x86 / boot / cmdline.c

diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c
index 680408a0f46317c898d5e73a620b499e9a9cbdb2..6b3b6f708c04262c02a788f815d1feac7d25786b 100644 (file)
--- a/arch/x86/boot/cmdline.c
+++ b/arch/x86/boot/cmdline.c
@@ -9,8 +9,6 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/cmdline.c
- *
  * Simple command-line parser for early boot.
  */
 
@@ -29,9 +27,8 @@ static inline int myisspace(u8 c)
  * Returns the length of the argument (regardless of if it was
  * truncated to fit in the buffer), or -1 on not found.
  */
-int cmdline_find_option(const char *option, char *buffer, int bufsize)
+int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize)
 {
-       u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr;
        addr_t cptr;
        char c;
        int len = -1;
@@ -102,9 +99,8 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize)
  * Returns the position of that option (starts counting with 1)
  * or 0 on not found
  */
-int cmdline_find_option_bool(const char *option)
+int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option)
 {
-       u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr;
        addr_t cptr;
        char c;
        int pos = 0, wstart = 0;