c6x changes for 4.20
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJb2glLAAoJEOiN4VijXeFPjfUQAJcSJ/NeoGGpj9T8/+InkEZ9 dFkB91lyylooew15b9s7Jvrm1kLDzQ6wZif3BzLuBqE4mkh58MawAuOVCYolzTlN dkaA5Jqz/CA0ycvQAnfKQKdzJlBDhRanUg1MmB2O018q4afGJKbMlhRicqKtVdv1 T5GVzwFLkklaAbmPgWOsTujvyK1aAlXUljwO31oKaFZT5Cjl2eM51NfmMiXzQ63o lqutmpMspCd9V+jac0aLlYonjFKVIoMHI687RUReIWlbsIySA2GMG/W7xLmnIxJe Ny2labiL/epmBlK3IgM0q/eW7RrZN5gX5o6TVpsVL2PJePEOQkMMVz6MAZAt4u9k MVcdeuWCqOawMtoyKLUsC/N5ve/rRMildf/XUOL5uu171IEjp3WWCrHR1n1j5aH4 ouPiXjedB+k9muzi5lQGNERthvPqTshnPohu5xyZt2FcvcA15gbNBFKbzYTlaMVI YJANFfLBVaH2QnY1ZSXgp5k1zzlpueil7WB0sqQlbcr372KPJKyscGjXV+4Qa6iJ uUjXY8XTuNHeFC5/RKwY3CFWfbE4ebxtvRaUgniVvxYk/OiTjswRhTletMPXxG8+ QE4+ZNKC8NQfaaxba3yYTPd5Nk7+1WypZC3lbuJcObBQFrDFWpRF58ZGrB53+ssG 3mB+TupWvjV2KjasXozC =8GvY -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming Pull c6x update from Mark Salter. * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: c6x: switch to NO_BOOTMEM
This commit is contained in:
commit
adb6b2b2b5
|
@ -290,7 +290,6 @@ notrace void __init machine_init(unsigned long dt_ptr)
|
||||||
|
|
||||||
void __init setup_arch(char **cmdline_p)
|
void __init setup_arch(char **cmdline_p)
|
||||||
{
|
{
|
||||||
int bootmap_size;
|
|
||||||
struct memblock_region *reg;
|
struct memblock_region *reg;
|
||||||
|
|
||||||
printk(KERN_INFO "Initializing kernel\n");
|
printk(KERN_INFO "Initializing kernel\n");
|
||||||
|
@ -347,16 +346,6 @@ void __init setup_arch(char **cmdline_p)
|
||||||
init_mm.end_data = memory_start;
|
init_mm.end_data = memory_start;
|
||||||
init_mm.brk = memory_start;
|
init_mm.brk = memory_start;
|
||||||
|
|
||||||
/*
|
|
||||||
* Give all the memory to the bootmap allocator, tell it to put the
|
|
||||||
* boot mem_map at the start of memory
|
|
||||||
*/
|
|
||||||
bootmap_size = init_bootmem_node(NODE_DATA(0),
|
|
||||||
memory_start >> PAGE_SHIFT,
|
|
||||||
PAGE_OFFSET >> PAGE_SHIFT,
|
|
||||||
memory_end >> PAGE_SHIFT);
|
|
||||||
memblock_reserve(memory_start, bootmap_size);
|
|
||||||
|
|
||||||
unflatten_and_copy_device_tree();
|
unflatten_and_copy_device_tree();
|
||||||
|
|
||||||
c6x_cache_init();
|
c6x_cache_init();
|
||||||
|
@ -391,22 +380,9 @@ void __init setup_arch(char **cmdline_p)
|
||||||
/* Initialize the coherent memory allocator */
|
/* Initialize the coherent memory allocator */
|
||||||
coherent_mem_init(dma_start, dma_size);
|
coherent_mem_init(dma_start, dma_size);
|
||||||
|
|
||||||
/*
|
|
||||||
* Free all memory as a starting point.
|
|
||||||
*/
|
|
||||||
free_bootmem(PAGE_OFFSET, memory_end - PAGE_OFFSET);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Then reserve memory which is already being used.
|
|
||||||
*/
|
|
||||||
for_each_memblock(reserved, reg) {
|
|
||||||
pr_debug("reserved - 0x%08x-0x%08x\n",
|
|
||||||
(u32) reg->base, (u32) reg->size);
|
|
||||||
reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
|
|
||||||
}
|
|
||||||
|
|
||||||
max_low_pfn = PFN_DOWN(memory_end);
|
max_low_pfn = PFN_DOWN(memory_end);
|
||||||
min_low_pfn = PFN_UP(memory_start);
|
min_low_pfn = PFN_UP(memory_start);
|
||||||
|
max_pfn = max_low_pfn;
|
||||||
max_mapnr = max_low_pfn - min_low_pfn;
|
max_mapnr = max_low_pfn - min_low_pfn;
|
||||||
|
|
||||||
/* Get kmalloc into gear */
|
/* Get kmalloc into gear */
|
||||||
|
|
Loading…
Reference in a new issue