Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

torvalds · torvalds · commit b49750006939 · 2015-07-24T12:31:30.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1139,7 +1139,7 @@ static void __init load_hv_initrd(void)`
`1139`	`1139`
`1140`	`1140`	`void __init free_initrd_mem(unsigned long begin, unsigned long end)`
`1141`	`1141`	`{`
`1142`		`- free_bootmem(__pa(begin), end - begin);`
	`1142`	`+ free_bootmem_late(__pa(begin), end - begin);`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`	`1145`	`static int __init setup_initrd(char *str)`