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
  ...

2 files changed, 23 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 22320804fbaf..fd664b3ab99e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1420,6 +1420,28 @@ config KALLSYMS_ALL
 
            Say N unless you really need all symbols.
 
+config KALLSYMS_ABSOLUTE_PERCPU
+        bool
+        default X86_64 && SMP
+
+config KALLSYMS_BASE_RELATIVE
+        bool
+        depends on KALLSYMS
+        default !IA64 && !(TILE && 64BIT)
+        help
+          Instead of emitting them as absolute values in the native word size,
+          emit the symbol references in the kallsyms table as 32-bit entries,
+          each containing a relative value in the range [base, base + U32_MAX]
+          or, when KALLSYMS_ABSOLUTE_PERCPU is in effect, each containing either
+          an absolute value in the range [0, S32_MAX] or a relative value in the
+          range [base, base + S32_MAX], where base is the lowest relative symbol
+          address encountered in the image.
+
+          On 64-bit builds, this reduces the size of the address table by 50%,
+          but more importantly, it results in entries whose values are build
+          time constants, and no relocation pass is required at runtime to fix
+          up the entries based on the runtime load address of the kernel.
+
 config PRINTK
         default y
         bool "Enable support for printk" if EXPERT
diff --git a/init/main.c b/init/main.c
index 8dc93df20f7f..b3c6e363ae18 100644
--- a/init/main.c
+++ b/init/main.c
@@ -705,7 +705,6 @@ static int __init initcall_blacklist(char *str)
 
 static bool __init_or_module initcall_blacklisted(initcall_t fn)
 {
-        struct list_head *tmp;
         struct blacklist_entry *entry;
         char *fn_name;
 
@@ -713,8 +712,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
         if (!fn_name)
                 return false;
 
-        list_for_each(tmp, &blacklisted_initcalls) {
-                entry = list_entry(tmp, struct blacklist_entry, next);
+        list_for_each_entry(entry, &blacklisted_initcalls, next) {
                 if (!strcmp(fn_name, entry->buf)) {
                         pr_debug("initcall %s blacklisted\n", fn_name);
                         kfree(fn_name);