diff options
Diffstat (limited to 'arch/x86/boot/cmdline.c')
-rw-r--r-- | arch/x86/boot/cmdline.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c index 6b3b6f708c04..625d21b0cd3f 100644 --- a/arch/x86/boot/cmdline.c +++ b/arch/x86/boot/cmdline.c | |||
@@ -27,7 +27,7 @@ static inline int myisspace(u8 c) | |||
27 | * Returns the length of the argument (regardless of if it was | 27 | * Returns the length of the argument (regardless of if it was |
28 | * truncated to fit in the buffer), or -1 on not found. | 28 | * truncated to fit in the buffer), or -1 on not found. |
29 | */ | 29 | */ |
30 | int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize) | 30 | int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize) |
31 | { | 31 | { |
32 | addr_t cptr; | 32 | addr_t cptr; |
33 | char c; | 33 | char c; |
@@ -41,8 +41,8 @@ int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int | |||
41 | st_bufcpy /* Copying this to buffer */ | 41 | st_bufcpy /* Copying this to buffer */ |
42 | } state = st_wordstart; | 42 | } state = st_wordstart; |
43 | 43 | ||
44 | if (!cmdline_ptr || cmdline_ptr >= 0x100000) | 44 | if (!cmdline_ptr) |
45 | return -1; /* No command line, or inaccessible */ | 45 | return -1; /* No command line */ |
46 | 46 | ||
47 | cptr = cmdline_ptr & 0xf; | 47 | cptr = cmdline_ptr & 0xf; |
48 | set_fs(cmdline_ptr >> 4); | 48 | set_fs(cmdline_ptr >> 4); |
@@ -99,7 +99,7 @@ int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int | |||
99 | * Returns the position of that option (starts counting with 1) | 99 | * Returns the position of that option (starts counting with 1) |
100 | * or 0 on not found | 100 | * or 0 on not found |
101 | */ | 101 | */ |
102 | int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option) | 102 | int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option) |
103 | { | 103 | { |
104 | addr_t cptr; | 104 | addr_t cptr; |
105 | char c; | 105 | char c; |
@@ -111,8 +111,8 @@ int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option) | |||
111 | st_wordskip, /* Miscompare, skip */ | 111 | st_wordskip, /* Miscompare, skip */ |
112 | } state = st_wordstart; | 112 | } state = st_wordstart; |
113 | 113 | ||
114 | if (!cmdline_ptr || cmdline_ptr >= 0x100000) | 114 | if (!cmdline_ptr) |
115 | return -1; /* No command line, or inaccessible */ | 115 | return -1; /* No command line */ |
116 | 116 | ||
117 | cptr = cmdline_ptr & 0xf; | 117 | cptr = cmdline_ptr & 0xf; |
118 | set_fs(cmdline_ptr >> 4); | 118 | set_fs(cmdline_ptr >> 4); |