Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "A few more s390 patches for 4.9:
   - a fix for an overflow in the dasd driver reported by UBSAN
   - fix a regression and add hotplug memory to the zone movable again
   - add ignore defines for the pkey system calls
   - fix the ouput of the merged stack tracer
   - replace printk with pr_cont in arch/s390 where appropriate
   - remove the arch specific return_address function again
   - ignore reserved channel paths at boot time
   - add a missing hugetlb_bad_size call to the arch backend"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: fix zone calculation in arch_add_memory()
  s390/dumpstack: use pr_cont within show_stack and die
  s390/dumpstack: get rid of return_address again
  s390/disassambler: use pr_cont where appropriate
  s390/dumpstack: use pr_cont where appropriate
  s390/dumpstack: restore reliable indicator for call traces
  s390/mm: use hugetlb_bad_size()
  s390/cio: don't register chpids in reserved state
  s390: ignore pkey system calls
  s390/dasd: avoid undefined behaviour

2 files changed, 22 insertions, 17 deletions

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index cd404aa3931c..4a0c5bce3552 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -217,6 +217,7 @@ static __init int setup_hugepagesz(char *opt)
         } else if (MACHINE_HAS_EDAT2 && size == PUD_SIZE) {
                 hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);
         } else {
+                hugetlb_bad_size();
                 pr_err("hugepagesz= specifies an unsupported page size %s\n",
                         string);
                 return 0;
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index f56a39bd8ba6..b3e9d18f2ec6 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -151,36 +151,40 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
 {
-        unsigned long normal_end_pfn = PFN_DOWN(memblock_end_of_DRAM());
-        unsigned long dma_end_pfn = PFN_DOWN(MAX_DMA_ADDRESS);
+        unsigned long zone_start_pfn, zone_end_pfn, nr_pages;
         unsigned long start_pfn = PFN_DOWN(start);
         unsigned long size_pages = PFN_DOWN(size);
-        unsigned long nr_pages;
-        int rc, zone_enum;
+        pg_data_t *pgdat = NODE_DATA(nid);
+        struct zone *zone;
+        int rc, i;
 
         rc = vmem_add_mapping(start, size);
         if (rc)
                 return rc;
 
-        while (size_pages > 0) {
-                if (start_pfn < dma_end_pfn) {
-                        nr_pages = (start_pfn + size_pages > dma_end_pfn) ?
-                                   dma_end_pfn - start_pfn : size_pages;
-                        zone_enum = ZONE_DMA;
-                } else if (start_pfn < normal_end_pfn) {
-                        nr_pages = (start_pfn + size_pages > normal_end_pfn) ?
-                                   normal_end_pfn - start_pfn : size_pages;
-                        zone_enum = ZONE_NORMAL;
+        for (i = 0; i < MAX_NR_ZONES; i++) {
+                zone = pgdat->node_zones + i;
+                if (zone_idx(zone) != ZONE_MOVABLE) {
+                        /* Add range within existing zone limits, if possible */
+                        zone_start_pfn = zone->zone_start_pfn;
+                        zone_end_pfn = zone->zone_start_pfn +
+                                       zone->spanned_pages;
                 } else {
-                        nr_pages = size_pages;
-                        zone_enum = ZONE_MOVABLE;
+                        /* Add remaining range to ZONE_MOVABLE */
+                        zone_start_pfn = start_pfn;
+                        zone_end_pfn = start_pfn + size_pages;
                 }
-                rc = __add_pages(nid, NODE_DATA(nid)->node_zones + zone_enum,
-                                 start_pfn, size_pages);
+                if (start_pfn < zone_start_pfn || start_pfn >= zone_end_pfn)
+                        continue;
+                nr_pages = (start_pfn + size_pages > zone_end_pfn) ?
+                           zone_end_pfn - start_pfn : size_pages;
+                rc = __add_pages(nid, zone, start_pfn, nr_pages);
                 if (rc)
                         break;
                 start_pfn += nr_pages;
                 size_pages -= nr_pages;
+                if (!size_pages)
+                        break;
         }
         if (rc)
                 vmem_remove_mapping(start, size);