Merge branch 'for-5.1/nfit/ars' into libnvdimm-for-next

Merge several updates to the ARS implementation. Highlights include:

* Support retrieval of short-ARS results if the ARS state is "requires
  continuation", and even if the "no_init_ars" module parameter is
  specified.
* Allow busy-polling of the kernel ARS state by allowing root to reset
  the exponential back-off timer.
* Filter potentially stale ARS results by tracking query-ARS relative to
  the previous start-ARS.

1 files changed, 10 insertions, 8 deletions

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 07da5c6c5ba0..368267c1b71b 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -21,14 +21,16 @@ struct vmem_altmap;
  * walkers which rely on the fully initialized page->flags and others
  * should use this rather than pfn_valid && pfn_to_page
  */
-#define pfn_to_online_page(pfn)                         \
-({                                                      \
-        struct page *___page = NULL;                    \
-        unsigned long ___nr = pfn_to_section_nr(pfn);   \
-                                                        \
-        if (___nr < NR_MEM_SECTIONS && online_section_nr(___nr))\
-                ___page = pfn_to_page(pfn);             \
-        ___page;                                        \
+#define pfn_to_online_page(pfn)                                    \
+({                                                                 \
+        struct page *___page = NULL;                               \
+        unsigned long ___pfn = pfn;                                \
+        unsigned long ___nr = pfn_to_section_nr(___pfn);           \
+                                                                   \
+        if (___nr < NR_MEM_SECTIONS && online_section_nr(___nr) && \
+            pfn_valid_within(___pfn))                              \
+                ___page = pfn_to_page(___pfn);                     \
+        ___page;                                                   \
 })
 
 /*