diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 08:23:07 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 08:23:07 -0400 |
| commit | bc63de7c5bcc44b0098d09931f69a19e93d8a7ba (patch) | |
| tree | 7763679472e08b56a403bbcb9dffbc4b53620dcc /arch/tile | |
| parent | c45c1cd7bf4e997c74407dd29268d41d7adbb257 (diff) | |
| download | linux-3.10-bc63de7c5bcc44b0098d09931f69a19e93d8a7ba.tar.gz linux-3.10-bc63de7c5bcc44b0098d09931f69a19e93d8a7ba.tar.bz2 linux-3.10-bc63de7c5bcc44b0098d09931f69a19e93d8a7ba.zip | |
arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 4dd21c1e6d5..e7d54c73d5c 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) |