xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'fixes' and 'misc' into for-linus

Browse Source
This commit is contained in:
Russell King
2014-01-28 21:38:48 +00:00
parent 54c0a4b461 d326b65c57 c5ca95b507
commit f5137a45c2
6 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mm/init.c
View File

@@ -290,10 +290,11 @@ void __init arm_memblock_init(struct meminfo *mi,
#endif
#ifdef CONFIG_BLK_DEV_INITRD
/* FDT scan will populate initrd_start */
if (initrd_start) {
if (initrd_start && !phys_initrd_size) {
phys_initrd_start = __virt_to_phys(initrd_start);
phys_initrd_size = initrd_end - initrd_start;
}
initrd_start = initrd_end = 0;
if (phys_initrd_size &&
!memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {
pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",