diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 16:19:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 16:19:52 +0200 |
| commit | a1f0bcccffe508b36f8eb0bd39771d4bedc683a8 (patch) | |
| tree | e4ca41552b440c9a69d70bacd4d1c26bdc35b694 /arch/microblaze/mm/init.c | |
| parent | Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | microblaze: Enable IRQ in arch_cpu_idle (diff) | |
| download | linux-a1f0bcccffe508b36f8eb0bd39771d4bedc683a8.tar.xz linux-a1f0bcccffe508b36f8eb0bd39771d4bedc683a8.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek.
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Enable IRQ in arch_cpu_idle
microblaze: Fix uaccess_ok macro
microblaze: Add support for new cpu versions and target architecture
microblaze: Do not select OPT_LIB_ASM by default
microblaze: Fix initrd support
microblaze: Do not use r6 in head.S
microblaze: pci: Remove duplicated header
microblaze: Set the default irq_domain
microblaze: pci: Remove duplicated include from pci-common.c
Diffstat (limited to 'arch/microblaze/mm/init.c')
| -rw-r--r-- | arch/microblaze/mm/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 4ec137d13ad7..b38ae3acfeb4 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -404,10 +404,11 @@ asmlinkage void __init mmu_init(void) #if defined(CONFIG_BLK_DEV_INITRD) /* Remove the init RAM disk from the available memory. */ -/* if (initrd_start) { - mem_pieces_remove(&phys_avail, __pa(initrd_start), - initrd_end - initrd_start, 1); - }*/ + if (initrd_start) { + unsigned long size; + size = initrd_end - initrd_start; + memblock_reserve(virt_to_phys(initrd_start), size); + } #endif /* CONFIG_BLK_DEV_INITRD */ /* Initialize the MMU hardware */ |