summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/memblock.h
diff options
context:
space:
mode:
authorJiri Kosina2010-08-04 15:14:38 +0200
committerJiri Kosina2010-08-04 15:14:38 +0200
commitd790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch)
tree854ab394486288d40fa8179cbfaf66e8bdc44b0f /arch/powerpc/include/asm/memblock.h
parentfix comment typo "choosed" -> "chosen" (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (diff)
downloadkernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.gz
kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.xz
kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.zip
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/include/asm/memblock.h')
-rw-r--r--arch/powerpc/include/asm/memblock.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/memblock.h b/arch/powerpc/include/asm/memblock.h
new file mode 100644
index 000000000000..3c29728b56b1
--- /dev/null
+++ b/arch/powerpc/include/asm/memblock.h
@@ -0,0 +1,15 @@
+#ifndef _ASM_POWERPC_MEMBLOCK_H
+#define _ASM_POWERPC_MEMBLOCK_H
+
+#include <asm/udbg.h>
+
+#define MEMBLOCK_DBG(fmt...) udbg_printf(fmt)
+
+#ifdef CONFIG_PPC32
+extern phys_addr_t lowmem_end_addr;
+#define MEMBLOCK_REAL_LIMIT lowmem_end_addr
+#else
+#define MEMBLOCK_REAL_LIMIT 0
+#endif
+
+#endif /* _ASM_POWERPC_MEMBLOCK_H */