diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:52:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-10 18:52:11 +0100 |
| commit | 02df083201272c0c2e061b18d9c20635974abf6d (patch) | |
| tree | 788321ae7a4867c4c06bd1d070cb98d49d009b76 /arch/ia64 | |
| parent | 0679715e714345d273c0e1eb78078535ffc4b2a1 (diff) | |
| parent | bef1d88263ff769f15aa0e1515cdcede84e61d15 (diff) | |
| download | linux-02df083201272c0c2e061b18d9c20635974abf6d.tar.bz2 | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/mm/init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 58fd67068bac..b01d68a2d5d9 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -689,9 +689,7 @@ void arch_remove_memory(int nid, u64 start, u64 size, { unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; - struct zone *zone; - zone = page_zone(pfn_to_page(start_pfn)); - __remove_pages(zone, start_pfn, nr_pages, altmap); + __remove_pages(start_pfn, nr_pages, altmap); } #endif |