Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b824a957 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v4.11-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull nios2 fix from Ley Foon Tan:

 - nios2: reserve boot memory for device tree

* tag 'nios2-v4.11-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: reserve boot memory for device tree
parents 1a589c04 921d701e

arch/nios2/kernel/prom.c

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) 
	return alloc_bootmem_align(size, align);

}



int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,

					     bool nomap)

{

	reserve_bootmem(base, size, BOOTMEM_DEFAULT);

	return 0;

}



void __init early_init_devtree(void *params)

{

	__be32 *dtb = (u32 *)__dtb_start;

arch/nios2/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ void __init setup_arch(char **cmdline_p) 
	}

#endif /* CONFIG_BLK_DEV_INITRD */



	early_init_fdt_reserve_self();

	early_init_fdt_scan_reserved_mem();



	unflatten_and_copy_device_tree();



	setup_cpuinfo();