Commit db2451e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bootconfig-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull bootconfig update from Masami Hiramatsu:

 - Remove duplicate included header file linux/bootconfig.h from
   lib/bootconfig.c. This is a cleanup, no behavior change.

* tag 'bootconfig-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  bootconfig: Remove duplicate included header file linux/bootconfig.h
parents 91bd008d 0d9c0a67

lib/bootconfig.c

+9 −11
Original line number Diff line number Diff line
@@ -4,8 +4,16 @@ 
 * Masami Hiramatsu <mhiramat@kernel.org>

 */



#ifdef __KERNEL__

/*

 * NOTE: This is only for tools/bootconfig, because tools/bootconfig will

 * run the parser sanity test.

 * This does NOT mean lib/bootconfig.c is available in the user space.

 * However, if you change this file, please make sure the tools/bootconfig

 * has no issue on building and running.

 */

#include <linux/bootconfig.h>



#ifdef __KERNEL__

#include <linux/bug.h>

#include <linux/ctype.h>

#include <linux/errno.h>
@@ -24,16 +32,6 @@ const char * __init xbc_get_embedded_bootconfig(size_t *size) 
	return (*size) ? embedded_bootconfig_data : NULL;

}

#endif



#else /* !__KERNEL__ */

/*

 * NOTE: This is only for tools/bootconfig, because tools/bootconfig will

 * run the parser sanity test.

 * This does NOT mean lib/bootconfig.c is available in the user space.

 * However, if you change this file, please make sure the tools/bootconfig

 * has no issue on building and running.

 */

#include <linux/bootconfig.h>

#endif



/*