aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-06 18:39:00 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 22:56:06 -0400
commit27f574c223d2c09610058b3ec7a29582d63a3e06 (patch)
tree2689c93200504ff0d8734be50a8ca329607d8807
parentc3f72b5706716ada7923def513486ab7bb3a5301 (diff)
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 4072b871497d..a542ff5ec8a9 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)
625 if (machine_is(cell)) 625 if (machine_is(cell))
626 limit = 0x80000000; 626 limit = 0x80000000;
627 else 627 else
628 limit = 0; 628 limit = MEMBLOCK_ALLOC_ANYWHERE;
629 629
630 table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit); 630 table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);
631 631
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 367dea6e95a0..3cf3304e901d 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);
50extern u64 __init memblock_alloc(u64 size, u64 align); 50extern u64 __init memblock_alloc(u64 size, u64 align);
51extern u64 __init memblock_alloc_base(u64 size, 51extern u64 __init memblock_alloc_base(u64 size,
52 u64, u64 max_addr); 52 u64, u64 max_addr);
53#define MEMBLOCK_ALLOC_ANYWHERE 0
53extern u64 __init __memblock_alloc_base(u64 size, 54extern u64 __init __memblock_alloc_base(u64 size,
54 u64 align, u64 max_addr); 55 u64 align, u64 max_addr);
55extern u64 __init memblock_phys_mem_size(void); 56extern u64 __init memblock_phys_mem_size(void);
diff --git a/mm/memblock.c b/mm/memblock.c
index e264e8c70892..0131684c42f8 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -15,8 +15,6 @@
15#include <linux/bitops.h> 15#include <linux/bitops.h>
16#include <linux/memblock.h> 16#include <linux/memblock.h>
17 17
18#define MEMBLOCK_ALLOC_ANYWHERE 0
19
20struct memblock memblock; 18struct memblock memblock;
21 19
22static int memblock_debug; 20static int memblock_debug;