block: don't make REQ_POLLED imply REQ_NOWAIT

[platform/kernel/linux-starfive.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 8e0fa20..3f231cf 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -13,7 +13,6 @@
 #include <linux/pagemap.h>
 #include <linux/compiler.h>
 #include <linux/export.h>
-#include <linux/pagevec.h>
 #include <linux/writeback.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
@@ -325,7 +324,7 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
        }
 
        if (check_pfn_span(pfn, nr_pages)) {
-               WARN(1, "Misaligned %s start: %#lx end: #%lx\n", __func__, pfn, pfn + nr_pages - 1);
+               WARN(1, "Misaligned %s start: %#lx end: %#lx\n", __func__, pfn, pfn + nr_pages - 1);
                return -EINVAL;
        }
 
@@ -492,18 +491,6 @@ void __ref remove_pfn_range_from_zone(struct zone *zone,
        set_zone_contiguous(zone);
 }
 
-static void __remove_section(unsigned long pfn, unsigned long nr_pages,
-                            unsigned long map_offset,
-                            struct vmem_altmap *altmap)
-{
-       struct mem_section *ms = __pfn_to_section(pfn);
-
-       if (WARN_ON_ONCE(!valid_section(ms)))
-               return;
-
-       sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap);
-}
-
 /**
  * __remove_pages() - remove sections of pages
  * @pfn: starting pageframe (must be aligned to start of a section)
@@ -520,12 +507,9 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages,
 {
        const unsigned long end_pfn = pfn + nr_pages;
        unsigned long cur_nr_pages;
-       unsigned long map_offset = 0;
-
-       map_offset = vmem_altmap_offset(altmap);
 
        if (check_pfn_span(pfn, nr_pages)) {
-               WARN(1, "Misaligned %s start: %#lx end: #%lx\n", __func__, pfn, pfn + nr_pages - 1);
+               WARN(1, "Misaligned %s start: %#lx end: %#lx\n", __func__, pfn, pfn + nr_pages - 1);
                return;
        }
 
@@ -534,8 +518,7 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages,
                /* Select all remaining pages up to the next section boundary */
                cur_nr_pages = min(end_pfn - pfn,
                                   SECTION_ALIGN_UP(pfn + 1) - pfn);
-               __remove_section(pfn, cur_nr_pages, map_offset, altmap);
-               map_offset = 0;
+               sparse_remove_section(pfn, cur_nr_pages, altmap);
        }
 }
 
@@ -1172,16 +1155,6 @@ failed_addition:
        return ret;
 }
 
-static void reset_node_present_pages(pg_data_t *pgdat)
-{
-       struct zone *z;
-
-       for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
-               z->present_pages = 0;
-
-       pgdat->node_present_pages = 0;
-}
-
 /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
 static pg_data_t __ref *hotadd_init_pgdat(int nid)
 {
@@ -1204,15 +1177,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid)
         */
        build_all_zonelists(pgdat);
 
-       /*
-        * When memory is hot-added, all the memory is in offline state. So
-        * clear all zones' present_pages because they will be updated in
-        * online_pages() and offline_pages().
-        * TODO: should be in free_area_init_core_hotplug?
-        */
-       reset_node_managed_pages(pgdat);
-       reset_node_present_pages(pgdat);
-
        return pgdat;
 }