diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-03 22:59:06 (GMT) |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-03 22:59:06 (GMT) |
commit | 75d43b2d0a323ba894d85060888f039e41b441ca (patch) | |
tree | 2f49ace1f85510e8b21974e6dd45dfcc2a87666a /arch/powerpc/mm/numa.c | |
parent | d0b7abb2c7c05552aca2a0358c53b6a48eab2843 (diff) | |
parent | cb0446c1b625326682ec4f9d1dd10779433646bc (diff) | |
download | linux-75d43b2d0a323ba894d85060888f039e41b441ca.tar.xz |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
Freescale updates from Scott (27 commits):
"Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit
FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board
support, and PrPMC PCI enumeration."
Diffstat (limited to 'arch/powerpc/mm/numa.c')
-rw-r--r-- | arch/powerpc/mm/numa.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index ec32d46..649666d 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1134,14 +1134,6 @@ void __init do_init_bootmem(void) } } -void __init paging_init(void) -{ - unsigned long max_zone_pfns[MAX_NR_ZONES]; - memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); - max_zone_pfns[ZONE_DMA] = memblock_end_of_DRAM() >> PAGE_SHIFT; - free_area_init_nodes(max_zone_pfns); -} - static int __init early_numa(char *p) { if (!p) |