diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
| commit | 9beee7af111a7afa5f7b787daaf8a6891c05f216 (patch) | |
| tree | 92fdbea807b9ef2917d1f087355f08617230dd75 /mm/memblock.c | |
| parent | e8490c42825967752fef08dddf37eb3f5f34d753 (diff) | |
| parent | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.04-android
Conflicts:
keep -fno-pic flag in arch/arm64/Makefile
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 9318b567ed79..9742d1ac10a5 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1316,7 +1316,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size) end = PFN_DOWN(base + size); for (; cursor < end; cursor++) { - __free_pages_bootmem(pfn_to_page(cursor), 0); + __free_pages_bootmem(pfn_to_page(cursor), cursor, 0); totalram_pages++; } } |