diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:10:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:10:05 +0200 |
| commit | 6e64e22449023dc89dfb92c6f19d4c5b03f46889 (patch) | |
| tree | c0099a75238a2cdcedf005956963329eee0aac75 /arch/tile/kernel/setup.c | |
| parent | staging: lustre: Replace strtoul with simple_strtoul (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.tar.xz linux-6e64e22449023dc89dfb92c6f19d4c5b03f46889.zip | |
Merge 4.2-rc4 into staging-next
We want the iio and other fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/tile/kernel/setup.c')
| -rw-r--r-- | arch/tile/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 99c9ff87e018..6b755d125783 100644 --- 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) |