Commit b88c4767 authored by Robert Jennings's avatar Robert Jennings Committed by Benjamin Herrenschmidt
Browse files

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: default avatarRobert C Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ec32dd66

arch/powerpc/include/asm/setup.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/kernel/module.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/kernel/module_32.c

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/module_64.c

+1 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/setup-common.c

+0 −2
Original line number Diff line number Diff line
@@ -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)