summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2009-05-08 12:19:27 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-15 16:43:41 +1000
commit49a849652513235a244dfbf5e58c54f796bd1148 (patch)
tree809fe33bad6255fab153fb5a7f03170150ab88c7 /arch/powerpc/include
parent31207dab7d2e63795eb15823947bd2f7025b08e2 (diff)
downloadlinux-3.10-49a849652513235a244dfbf5e58c54f796bd1148.tar.gz
linux-3.10-49a849652513235a244dfbf5e58c54f796bd1148.tar.bz2
linux-3.10-49a849652513235a244dfbf5e58c54f796bd1148.zip
powerpc: Allow mem=x cmdline to work with 4G+
We're currently choking on mem=4g (and above) due to memory_limit being specified as an unsigned long. Make memory_limit phys_addr_t to fix this. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index f612798e1c9..2b2420a4988 100644
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -212,7 +212,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 phys_addr_t memory_limit;
extern unsigned long klimit;
extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);