Skip to content

Commit 5791490

Browse files
andy-shevkees
authored andcommitted
kernel.h: Move lib/cmdline.c prototypes to string.h
The lib/cmdline.c is basically a set of some small string parsers which are wide used in the kernel. Their prototypes belong to the string.h rather then kernel.h. Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]>
1 parent 67bbd2f commit 5791490

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

include/linux/kernel.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,6 @@ static inline void might_fault(void) { }
165165

166166
void do_exit(long error_code) __noreturn;
167167

168-
extern int get_option(char **str, int *pint);
169-
extern char *get_options(const char *str, int nints, int *ints);
170-
extern unsigned long long memparse(const char *ptr, char **retptr);
171-
extern bool parse_option_str(const char *str, const char *option);
172-
extern char *next_arg(char *args, char **param, char **val);
173-
174168
extern int core_kernel_text(unsigned long addr);
175169
extern int __kernel_text_address(unsigned long addr);
176170
extern int kernel_text_address(unsigned long addr);

include/linux/string.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,17 @@ extern void *kmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2);
286286
extern void *kvmemdup(const void *src, size_t len, gfp_t gfp) __realloc_size(2);
287287
extern char *kmemdup_nul(const char *s, size_t len, gfp_t gfp);
288288

289+
/* lib/argv_split.c */
289290
extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
290291
extern void argv_free(char **argv);
291292

293+
/* lib/cmdline.c */
294+
extern int get_option(char **str, int *pint);
295+
extern char *get_options(const char *str, int nints, int *ints);
296+
extern unsigned long long memparse(const char *ptr, char **retptr);
297+
extern bool parse_option_str(const char *str, const char *option);
298+
extern char *next_arg(char *args, char **param, char **val);
299+
292300
extern bool sysfs_streq(const char *s1, const char *s2);
293301
int match_string(const char * const *array, size_t n, const char *string);
294302
int __sysfs_match_string(const char * const *array, size_t n, const char *s);

0 commit comments

Comments
 (0)