Merge 4.16-rc6 into tty-next

We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index 5a9ca2a1751b..b6ba6b7adadc 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1107,7 +1107,7 @@ unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
         struct memblock_type *type = &memblock.memory;
         unsigned int right = type->cnt;
         unsigned int mid, left = 0;
-        phys_addr_t addr = PFN_PHYS(pfn + 1);
+        phys_addr_t addr = PFN_PHYS(++pfn);
 
         do {
                 mid = (right + left) / 2;
@@ -1118,15 +1118,15 @@ unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
                                   type->regions[mid].size))
                         left = mid + 1;
                 else {
-                        /* addr is within the region, so pfn + 1 is valid */
-                        return min(pfn + 1, max_pfn);
+                        /* addr is within the region, so pfn is valid */
+                        return pfn;
                 }
         } while (left < right);
 
         if (right == type->cnt)
-                return max_pfn;
+                return -1UL;
         else
-                return min(PHYS_PFN(type->regions[right].base), max_pfn);
+                return PHYS_PFN(type->regions[right].base);
 }
 
 /**