From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 3 Oct 2014 22:59:06 +0000 (+1000)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
X-Git-Tag: v4.14-rc1~6606^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75d43b2d0a323ba894d85060888f039e41b441ca;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'next' of git://git./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."
---

75d43b2d0a323ba894d85060888f039e41b441ca
diff --cc arch/powerpc/mm/numa.c
index ec32d46,5eb07f3..649666d
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@@ -1124,24 -1122,10 +1124,16 @@@ void __init do_init_bootmem(void
  
  	reset_numa_cpu_lookup_table();
  	register_cpu_notifier(&ppc64_numa_nb);
 -	cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,
 -			  (void *)(unsigned long)boot_cpuid);
 +	/*
 +	 * We need the numa_cpu_lookup_table to be accurate for all CPUs,
 +	 * even before we online them, so that we can use cpu_to_{node,mem}
 +	 * early in boot, cf. smp_prepare_cpus().
 +	 */
 +	for_each_present_cpu(cpu) {
 +		numa_setup_cpu((unsigned long)cpu);
 +	}
  }
  
- 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)