Merge branch 'akpm' (patches from Andrew)

Merge first patch-bomb from Andrew Morton:

 - some misc things

 - ofs2 updates

 - about half of MM

 - checkpatch updates

 - autofs4 update

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
  autofs4: fix string.h include in auto_dev-ioctl.h
  autofs4: use pr_xxx() macros directly for logging
  autofs4: change log print macros to not insert newline
  autofs4: make autofs log prints consistent
  autofs4: fix some white space errors
  autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked()
  autofs4: fix coding style line length in autofs4_wait()
  autofs4: fix coding style problem in autofs4_get_set_timeout()
  autofs4: coding style fixes
  autofs: show pipe inode in mount options
  kallsyms: add support for relative offsets in kallsyms address table
  kallsyms: don't overload absolute symbol type for percpu symbols
  x86: kallsyms: disable absolute percpu symbols on !SMP
  checkpatch: fix another left brace warning
  checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses
  checkpatch: warn on bare unsigned or signed declarations without int
  checkpatch: exclude asm volatile from complex macro check
  mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate()
  mm: migrate: consolidate mem_cgroup_migrate() calls
  mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
  ...

1 files changed, 4 insertions, 6 deletions

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index ef7d6c8fea66..d27fccbad7c1 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -94,16 +94,15 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         pgd_populate(&init_mm, pg_dir, pu_dir);
                 }
                 pu_dir = pud_offset(pg_dir, address);
-#ifndef CONFIG_DEBUG_PAGEALLOC
                 if (MACHINE_HAS_EDAT2 && pud_none(*pu_dir) && address &&
-                    !(address & ~PUD_MASK) && (address + PUD_SIZE <= end)) {
+                    !(address & ~PUD_MASK) && (address + PUD_SIZE <= end) &&
+                     !debug_pagealloc_enabled()) {
                         pud_val(*pu_dir) = __pa(address) |
                                 _REGION_ENTRY_TYPE_R3 | _REGION3_ENTRY_LARGE |
                                 (ro ? _REGION_ENTRY_PROTECT : 0);
                         address += PUD_SIZE;
                         continue;
                 }
-#endif
                 if (pud_none(*pu_dir)) {
                         pm_dir = vmem_pmd_alloc();
                         if (!pm_dir)
@@ -111,9 +110,9 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         pud_populate(&init_mm, pu_dir, pm_dir);
                 }
                 pm_dir = pmd_offset(pu_dir, address);
-#ifndef CONFIG_DEBUG_PAGEALLOC
                 if (MACHINE_HAS_EDAT1 && pmd_none(*pm_dir) && address &&
-                    !(address & ~PMD_MASK) && (address + PMD_SIZE <= end)) {
+                    !(address & ~PMD_MASK) && (address + PMD_SIZE <= end) &&
+                    !debug_pagealloc_enabled()) {
                         pmd_val(*pm_dir) = __pa(address) |
                                 _SEGMENT_ENTRY | _SEGMENT_ENTRY_LARGE |
                                 _SEGMENT_ENTRY_YOUNG |
@@ -121,7 +120,6 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         address += PMD_SIZE;
                         continue;
                 }
-#endif
                 if (pmd_none(*pm_dir)) {
                         pt_dir = vmem_pte_alloc(address);
                         if (!pt_dir)