aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-06 15:39:00 -0700
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-05 12:56:06 +1000
commit27f574c223d2c09610058b3ec7a29582d63a3e06 (patch)
tree2689c93200504ff0d8734be50a8ca329607d8807
parentc3f72b5706716ada7923def513486ab7bb3a5301 (diff)
downloadkernel_samsung_smdk4412-27f574c223d2c09610058b3ec7a29582d63a3e06.zip
kernel_samsung_smdk4412-27f574c223d2c09610058b3ec7a29582d63a3e06.tar.gz
kernel_samsung_smdk4412-27f574c223d2c09610058b3ec7a29582d63a3e06.tar.bz2
memblock: Expose MEMBLOCK_ALLOC_ANYWHERE
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
-rw-r--r--include/linux/memblock.h1
-rw-r--r--mm/memblock.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 4072b87..a542ff5 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -625,7 +625,7 @@ static void __init htab_initialize(void)
if (machine_is(cell))
limit = 0x80000000;
else
- limit = 0;
+ limit = MEMBLOCK_ALLOC_ANYWHERE;
table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 367dea6..3cf3304 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -50,6 +50,7 @@ extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid);
extern u64 __init memblock_alloc(u64 size, u64 align);
extern u64 __init memblock_alloc_base(u64 size,
u64, u64 max_addr);
+#define MEMBLOCK_ALLOC_ANYWHERE 0
extern u64 __init __memblock_alloc_base(u64 size,
u64 align, u64 max_addr);
extern u64 __init memblock_phys_mem_size(void);
diff --git a/mm/memblock.c b/mm/memblock.c
index e264e8c..0131684 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -15,8 +15,6 @@
#include <linux/bitops.h>
#include <linux/memblock.h>
-#define MEMBLOCK_ALLOC_ANYWHERE 0
-
struct memblock memblock;
static int memblock_debug;