summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-05-08 14:27:07 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-14 22:31:44 +1000
commit5f25f06529ecb4b20efc7ba00de599f5b9f4b63c (patch)
treeb41343c835446e16959faa1249424056e5340a3d
parent683307da07afd3a7ee55269ee8cb70c8053b0923 (diff)
downloadlinux-3.10-5f25f06529ecb4b20efc7ba00de599f5b9f4b63c.tar.gz
linux-3.10-5f25f06529ecb4b20efc7ba00de599f5b9f4b63c.tar.bz2
linux-3.10-5f25f06529ecb4b20efc7ba00de599f5b9f4b63c.zip
[POWERPC] Move declaration of init_bootmem_done into system.h
... instead of having an extern declaration in a .c file. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/mm/init_32.c3
-rw-r--r--include/asm-powerpc/system.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 1952b4d3fa7..45418590b6a 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -43,6 +43,7 @@
#include <asm/btext.h>
#include <asm/tlb.h>
#include <asm/sections.h>
+#include <asm/system.h>
#include "mmu_decl.h"
@@ -76,8 +77,6 @@ void MMU_init(void);
/* XXX should be in current.h -- paulus */
extern struct task_struct *current_set[NR_CPUS];
-extern int init_bootmem_done;
-
/*
* this tells the system to map all of ram with the segregs
* (i.e. page tables) instead of the bats.
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 2b6559a6d11..df781adac6d 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -190,6 +190,7 @@ extern struct task_struct *_switch(struct thread_struct *prev,
extern unsigned int rtas_data;
extern int mem_init_done; /* set on boot once kmalloc can be called */
+extern int init_bootmem_done; /* set on !NUMA once bootmem is available */
extern unsigned long memory_limit;
extern unsigned long klimit;