diff options
| author | Christoph Hellwig | 2019-06-26 14:27:13 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2019-07-02 19:32:44 +0200 |
| commit | 514caf23a70fd697fa2ece238b2cd8dcc73fb16f (patch) | |
| tree | 8e41e9dd323e5117baf1bdc044c2ce035c740483 /arch/powerpc/mm | |
| parent | memremap: remove the data field in struct dev_pagemap (diff) | |
| download | kernel-qcow2-linux-514caf23a70fd697fa2ece238b2cd8dcc73fb16f.tar.gz kernel-qcow2-linux-514caf23a70fd697fa2ece238b2cd8dcc73fb16f.tar.xz kernel-qcow2-linux-514caf23a70fd697fa2ece238b2cd8dcc73fb16f.zip | |
memremap: replace the altmap_valid field with a PGMAP_ALTMAP_VALID flag
Add a flags field to struct dev_pagemap to replace the altmap_valid
boolean to be a little more extensible. Also add a pgmap_altmap() helper
to find the optional altmap and clean up the code using the altmap using
it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 2540d3b2588c..a2923c5c1982 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -131,17 +131,9 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size, { unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; - struct page *page; + struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap); int ret; - /* - * If we have an altmap then we need to skip over any reserved PFNs - * when querying the zone. - */ - page = pfn_to_page(start_pfn); - if (altmap) - page += vmem_altmap_offset(altmap); - __remove_pages(page_zone(page), start_pfn, nr_pages, altmap); /* Remove htab bolted mappings for this section of memory */ |