Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 236260b90dd94516982ad67aa6f5449c4c37db7b

Authored by Jeremy Fitzhardinge
Committed by H. Peter Anvin
1 parent 153db80f8c
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: Allow memblock_init to be called early 

The Xen setup code needs to call memblock_x86_reserve_range() very early,
so allow it to initialize the memblock subsystem before doing so.  The
second memblock_init() is ignored.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
LKML-Reference: <4CACFDAD.3090900@goop.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

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

arch/x86/xen/enlighten.c
Diff comments   View file @ 236260b
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/console.h>
31 31 #include <linux/pci.h>
32 32 #include <linux/gfp.h>
  33 +#include <linux/memblock.h>
33 34  
34 35 #include <xen/xen.h>
35 36 #include <xen/interface/xen.h>
... ... @@ -1182,6 +1183,8 @@
1182 1183  
1183 1184 local_irq_disable();
1184 1185 early_boot_irqs_off();
  1186 +
  1187 + memblock_init();
1185 1188  
1186 1189 xen_raw_console_write("mapping kernel into physical memory\n");
1187 1190 pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
... ... @@ -752,6 +752,12 @@
752 752  
753 753 void __init memblock_init(void)
754 754 {
  755 + static int init_done __initdata = 0;
  756 +
  757 + if (init_done)
  758 + return;
  759 + init_done = 1;
  760 +
755 761 /* Hookup the initial arrays */
756 762 memblock.memory.regions = memblock_memory_init_regions;
757 763 memblock.memory.max = INIT_MEMBLOCK_REGIONS;