powerpc: Move local setup.h declarations to arch includes
Move the few declarations from arch/powerpc/kernel/setup.h into arch/powerpc/include/asm/setup.h. This resolves a sparse warning for arch/powerpc/mm/numa.c which defines do_init_bootmem() but can't include the setup.h header in the prior path. Resolves: arch/powerpc/mm/numa.c:998:13: warning: symbol 'do_init_bootmem' was not declared. Should it be static? Signed-off-by: Robert C Jennings <rcj@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
ec32dd663d
commit
b88c4767d9
|
@ -23,6 +23,10 @@ extern void reloc_got2(unsigned long);
|
|||
|
||||
#define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x)))
|
||||
|
||||
void check_for_initrd(void);
|
||||
void do_init_bootmem(void);
|
||||
void setup_panic(void);
|
||||
|
||||
#endif /* !__ASSEMBLY__ */
|
||||
|
||||
#endif /* _ASM_POWERPC_SETUP_H */
|
||||
|
|
|
@ -25,8 +25,7 @@
|
|||
#include <asm/uaccess.h>
|
||||
#include <asm/firmware.h>
|
||||
#include <linux/sort.h>
|
||||
|
||||
#include "setup.h"
|
||||
#include <asm/setup.h>
|
||||
|
||||
LIST_HEAD(module_bug_list);
|
||||
|
||||
|
|
|
@ -26,8 +26,7 @@
|
|||
#include <linux/cache.h>
|
||||
#include <linux/bug.h>
|
||||
#include <linux/sort.h>
|
||||
|
||||
#include "setup.h"
|
||||
#include <asm/setup.h>
|
||||
|
||||
#if 0
|
||||
#define DEBUGP printk
|
||||
|
|
|
@ -26,8 +26,7 @@
|
|||
#include <asm/firmware.h>
|
||||
#include <asm/code-patching.h>
|
||||
#include <linux/sort.h>
|
||||
|
||||
#include "setup.h"
|
||||
#include <asm/setup.h>
|
||||
|
||||
/* FIXME: We don't do .init separately. To do this, we'd need to have
|
||||
a separate r2 value in the init and core section, and stub between
|
||||
|
|
|
@ -62,8 +62,6 @@
|
|||
#include <mm/mmu_decl.h>
|
||||
#include <asm/fadump.h>
|
||||
|
||||
#include "setup.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#include <asm/udbg.h>
|
||||
#define DBG(fmt...) udbg_printf(fmt)
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
#ifndef _POWERPC_KERNEL_SETUP_H
|
||||
#define _POWERPC_KERNEL_SETUP_H
|
||||
|
||||
void check_for_initrd(void);
|
||||
void do_init_bootmem(void);
|
||||
void setup_panic(void);
|
||||
extern int do_early_xmon;
|
||||
|
||||
#endif /* _POWERPC_KERNEL_SETUP_H */
|
|
@ -40,8 +40,6 @@
|
|||
#include <asm/mmu_context.h>
|
||||
#include <asm/epapr_hcalls.h>
|
||||
|
||||
#include "setup.h"
|
||||
|
||||
#define DBG(fmt...)
|
||||
|
||||
extern void bootx_init(unsigned long r4, unsigned long phys);
|
||||
|
|
|
@ -68,8 +68,6 @@
|
|||
#include <asm/hugetlb.h>
|
||||
#include <asm/epapr_hcalls.h>
|
||||
|
||||
#include "setup.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(fmt...) udbg_printf(fmt)
|
||||
#else
|
||||
|
|
|
@ -34,8 +34,7 @@
|
|||
#include <asm/firmware.h>
|
||||
#include <asm/vdso.h>
|
||||
#include <asm/vdso_datapage.h>
|
||||
|
||||
#include "setup.h"
|
||||
#include <asm/setup.h>
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
|
|
Loading…
Reference in a new issue