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

torvalds · torvalds · commit 6be3dafc7c1d · 2023-02-20T18:25:30.000-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 &lt;asm/misc.h&gt; to fix a missing prototypes warning at build time
diff --git 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
@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <asm/misc.h>
+
 /*
  * Count the digits of @val including a possible sign.
  *

Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,18 @@`
`7`	`7`	`#include <linux/string.h>`
`8`	`8`	`#include <linux/ctype.h>`
`9`	`9`	`#include <asm/setup.h>`
	`10`	`+#include <asm/cmdline.h>`
`10`	`11`
`11`	`12`	`static inline int myisspace(u8 c)`
`12`	`13`	`{`
`13`	`14`	`return c <= ' '; /* Close enough approximation */`
`14`	`15`	`}`
`15`	`16`
`16`		`-/**`
	`17`	`+/*`
`17`	`18`	`* Find a boolean option (like quiet,noapic,nosmp....)`
`18`	`19`	`*`
`19`	`20`	`* @cmdline: the cmdline string`
	`21`	`+ * @max_cmdline_size: the maximum size of cmdline`
`20`	`22`	`* @option: option string to look for`
`21`	`23`	`*`
`22`	`24`	`* Returns the position of that @option (starts counting with 1)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`// SPDX-License-Identifier: GPL-2.0`
	`2`	`+#include <asm/misc.h>`
	`3`	`+`
`2`	`4`	`/*`
`3`	`5`	`* Count the digits of @val including a possible sign.`
`4`	`6`	`*`