Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 27f574c223d2c09610058b3ec7a29582d63a3e06

Authored by Benjamin Herrenschmidt
1 parent c3f72b5706
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

memblock: Expose MEMBLOCK_ALLOC_ANYWHERE 

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 3 changed files with 2 additions and 3 deletions Side-by-side Diff

arch/powerpc/mm/hash_utils_64.c
Diff comments   View file @ 27f574c
... ... @@ -625,7 +625,7 @@
625 625 if (machine_is(cell))
626 626 limit = 0x80000000;
627 627 else
628   - limit = 0;
  628 + limit = MEMBLOCK_ALLOC_ANYWHERE;
629 629  
630 630 table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);
631 631  
include/linux/memblock.h
Diff comments   View file @ 27f574c
... ... @@ -50,6 +50,7 @@
50 50 extern u64 __init memblock_alloc(u64 size, u64 align);
51 51 extern u64 __init memblock_alloc_base(u64 size,
52 52 u64, u64 max_addr);
  53 +#define MEMBLOCK_ALLOC_ANYWHERE 0
53 54 extern u64 __init __memblock_alloc_base(u64 size,
54 55 u64 align, u64 max_addr);
55 56 extern u64 __init memblock_phys_mem_size(void);
... ... @@ -15,8 +15,6 @@
15 15 #include <linux/bitops.h>
16 16 #include <linux/memblock.h>
17 17  
18   -#define MEMBLOCK_ALLOC_ANYWHERE 0
19   -
20 18 struct memblock memblock;
21 19  
22 20 static int memblock_debug;