diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 18:25:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 18:25:30 -0800 |
| commit | 6be3dafc7c1d323debb5910d697c5cd2cb19825f (patch) | |
| tree | 5ac4b799ea022fd16c6ae980c16e971b4ae15cb5 | |
| parent | 1f2d9ffc7a5f916935749ffc6e93fb33bfe94d2f (diff) | |
| parent | 65c24d7b0f9142c6acc9bd6dabeba22767077681 (diff) | |
| download | linux-6be3dafc7c1d323debb5910d697c5cd2cb19825f.tar.gz | |
Merge tag 'x86-asm-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm updates from Ingo Molnar:
"Header fixes and a DocBook fix"
* tag 'x86-asm-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/lib: Fix compiler and kernel-doc warnings
x86/lib: Include <asm/misc.h> to fix a missing prototypes warning at build time
| -rw-r--r-- | arch/x86/lib/cmdline.c | 4 | ||||
| -rw-r--r-- | arch/x86/lib/misc.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/lib/cmdline.c b/arch/x86/lib/cmdline.c index b6da0933930859..80570eb3c89be9 100644 --- a/arch/x86/lib/cmdline.c +++ b/arch/x86/lib/cmdline.c @@ -7,16 +7,18 @@ #include <linux/string.h> #include <linux/ctype.h> #include <asm/setup.h> +#include <asm/cmdline.h> static inline int myisspace(u8 c) { return c <= ' '; /* Close enough approximation */ } -/** +/* * Find a boolean option (like quiet,noapic,nosmp....) * * @cmdline: the cmdline string + * @max_cmdline_size: the maximum size of cmdline * @option: option string to look for * * Returns the position of that @option (starts counting with 1) diff --git a/arch/x86/lib/misc.c b/arch/x86/lib/misc.c index a018ec4fba53ef..92cd8ecc3a2c8c 100644 --- a/arch/x86/lib/misc.c +++ b/arch/x86/lib/misc.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <asm/misc.h> + /* * Count the digits of @val including a possible sign. * |