diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-01-30 07:33:03 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:03 -0500 |
commit | 70d8abf5df857ca7befe02e5d61fde807420a54c (patch) | |
tree | ce565b82ff7966938ca7c047519e4c7fbbafcc29 | |
parent | f7775016c66c2f45125f22968c351c88868ee7a3 (diff) |
x86 setup: add missing prototype; formatting fix
Add prototype for cmdline_find_option_bool() missing from:
x86 setup: early cmdline parser handle boolean options
Also, fix up a minor formatting error in that patch.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/boot/boot.h | 1 | ||||
-rw-r--r-- | arch/x86/boot/cmdline.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 8ec575249aa9..7822a4983da2 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h | |||
@@ -241,6 +241,7 @@ int query_apm_bios(void); | |||
241 | 241 | ||
242 | /* cmdline.c */ | 242 | /* cmdline.c */ |
243 | int cmdline_find_option(const char *option, char *buffer, int bufsize); | 243 | int cmdline_find_option(const char *option, char *buffer, int bufsize); |
244 | int cmdline_find_option_bool(const char *option); | ||
244 | 245 | ||
245 | /* cpu.c, cpucheck.c */ | 246 | /* cpu.c, cpucheck.c */ |
246 | int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr); | 247 | int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr); |
diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c index cc65a33bf65c..680408a0f463 100644 --- a/arch/x86/boot/cmdline.c +++ b/arch/x86/boot/cmdline.c | |||
@@ -107,7 +107,7 @@ int cmdline_find_option_bool(const char *option) | |||
107 | u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr; | 107 | u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr; |
108 | addr_t cptr; | 108 | addr_t cptr; |
109 | char c; | 109 | char c; |
110 | int pos =0 , wstart = 0; | 110 | int pos = 0, wstart = 0; |
111 | const char *opptr = NULL; | 111 | const char *opptr = NULL; |
112 | enum { | 112 | enum { |
113 | st_wordstart, /* Start of word/after whitespace */ | 113 | st_wordstart, /* Start of word/after whitespace */ |