Commit b4975000 authored by Linus Torvalds's avatar Linus Torvalds

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
parents c624406f 3f81d244
...@@ -1139,7 +1139,7 @@ static void __init load_hv_initrd(void) ...@@ -1139,7 +1139,7 @@ static void __init load_hv_initrd(void)
void __init free_initrd_mem(unsigned long begin, unsigned long end) 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) static int __init setup_initrd(char *str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment