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 | |
parent | c45c1cd7bf4e997c74407dd29268d41d7adbb257 (diff) |
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')
-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 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) | |||
953 | if (rc != stat.size) { | 953 | if (rc != stat.size) { |
954 | pr_err("Error reading %d bytes from hvfs file '%s': %d\n", | 954 | pr_err("Error reading %d bytes from hvfs file '%s': %d\n", |
955 | stat.size, initramfs_file, rc); | 955 | stat.size, initramfs_file, rc); |
956 | free_bootmem((unsigned long) initrd, stat.size); | 956 | free_initrd_mem((unsigned long) initrd, stat.size); |
957 | return; | 957 | return; |
958 | } | 958 | } |
959 | initrd_start = (unsigned long) initrd; | 959 | initrd_start = (unsigned long) initrd; |
@@ -962,7 +962,7 @@ static void __init load_hv_initrd(void) | |||
962 | 962 | ||
963 | void __init free_initrd_mem(unsigned long begin, unsigned long end) | 963 | void __init free_initrd_mem(unsigned long begin, unsigned long end) |
964 | { | 964 | { |
965 | free_bootmem(begin, end - begin); | 965 | free_bootmem(__pa(begin), end - begin); |
966 | } | 966 | } |
967 | 967 | ||
968 | static void __init validate_hv(void) | 968 | static void __init validate_hv(void) |