From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 13 Aug 2010 12:23:07 +0000 (-0400)
Subject: arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc63de7c5bcc44b0098d09931f69a19e93d8a7ba;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 4dd21c1e6d5e..e7d54c73d5c1 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -953,7 +953,7 @@ static void __init load_hv_initrd(void)
 	if (rc != stat.size) {
 		pr_err("Error reading %d bytes from hvfs file '%s': %d\n",
 		       stat.size, initramfs_file, rc);
-		free_bootmem((unsigned long) initrd, stat.size);
+		free_initrd_mem((unsigned long) initrd, stat.size);
 		return;
 	}
 	initrd_start = (unsigned long) initrd;
@@ -962,7 +962,7 @@ static void __init load_hv_initrd(void)
 
 void __init free_initrd_mem(unsigned long begin, unsigned long end)
 {
-	free_bootmem(begin, end - begin);
+	free_bootmem(__pa(begin), end - begin);
 }
 
 static void __init validate_hv(void)