diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-24 21:31:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-24 21:31:30 +0200 |
| commit | b497500069394c5612a4372536353832d64df37b (patch) | |
| tree | a17c9ff37d30367168a180fe963889b5092fd37e /arch | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | tile: use free_bootmem_late() for initrd (diff) | |
| download | linux-b497500069394c5612a4372536353832d64df37b.tar.xz linux-b497500069394c5612a4372536353832d64df37b.zip | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile bugfix from Chris Metcalf:
"This fixes a bug in freeing the initramfs memory"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: use free_bootmem_late() for initrd
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 99c9ff87e018..6b755d125783 100644 --- a/arch/tile/kernel/setup.c +++ b/arch/tile/kernel/setup.c @@ -1139,7 +1139,7 @@ static void __init load_hv_initrd(void) void __init free_initrd_mem(unsigned long begin, unsigned long end) { - free_bootmem(__pa(begin), end - begin); + free_bootmem_late(__pa(begin), end - begin); } static int __init setup_initrd(char *str) |