Merge tag 'x86-asm-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

6be3dafc · Linus Torvalds <[email protected]> · 2023-02-20 18:25:30 -08:00

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

Commit: 6be3dafc7c1d323debb5910d697c5cd2cb19825f
Parents: 1f2d9ffc · 65c24d7b

Merge commit. Changes below are compared with the first parent: 1f2d9ffc.

Changes

2 files changed · +5 −1

File	Status	Add	Del	Content
arch/x86/lib/cmdline.c	modified	+3	−1	View file
arch/x86/lib/misc.c	modified	+2	−0	View file

arch/x86/lib/cmdline.c

View file

diff --git a/arch/x86/lib/cmdline.c b/arch/x86/lib/cmdline.c
index b6da093..80570eb 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)

arch/x86/lib/misc.c

View file

diff --git a/arch/x86/lib/misc.c b/arch/x86/lib/misc.c
index a018ec4..92cd8ec 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.
  *