diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-03 20:26:03 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-03 20:26:03 -0400 |
| commit | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (patch) | |
| tree | a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73 /arch/powerpc/mm/tlb_nohash.c | |
| parent | e8e5c2155b0035b6e04f29be67f6444bc914005b (diff) | |
| parent | 0c2daaafcdec726e89cbccca61d576de8429c537 (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/mm/tlb_nohash.c')
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index 3b10f804b73..fe391e94252 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/pagemap.h> | 34 | #include <linux/pagemap.h> |
| 35 | #include <linux/preempt.h> | 35 | #include <linux/preempt.h> |
| 36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
| 37 | #include <linux/lmb.h> | 37 | #include <linux/memblock.h> |
| 38 | 38 | ||
| 39 | #include <asm/tlbflush.h> | 39 | #include <asm/tlbflush.h> |
| 40 | #include <asm/tlb.h> | 40 | #include <asm/tlb.h> |
| @@ -503,7 +503,7 @@ static void __early_init_mmu(int boot_cpu) | |||
| 503 | /* Set the global containing the top of the linear mapping | 503 | /* Set the global containing the top of the linear mapping |
| 504 | * for use by the TLB miss code | 504 | * for use by the TLB miss code |
| 505 | */ | 505 | */ |
| 506 | linear_map_top = lmb_end_of_DRAM(); | 506 | linear_map_top = memblock_end_of_DRAM(); |
| 507 | 507 | ||
| 508 | /* A sync won't hurt us after mucking around with | 508 | /* A sync won't hurt us after mucking around with |
| 509 | * the MMU configuration | 509 | * the MMU configuration |