Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:
 "Incoming:

   - lots of misc stuff

   - backlight tree updates

   - lib/ updates

   - Oleg's percpu-rwsem changes

   - checkpatch

   - rtc

   - aoe

   - more checkpoint/restart support

  I still have a pile of MM stuff pending - Pekka should be merging
  later today after which that is good to go.  A number of other things
  are twiddling thumbs awaiting maintainer merges."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  scatterlist: don't BUG when we can trivially return a proper error.
  docs: update documentation about /proc/<pid>/fdinfo/<fd> fanotify output
  fs, fanotify: add @mflags field to fanotify output
  docs: add documentation about /proc/<pid>/fdinfo/<fd> output
  fs, notify: add procfs fdinfo helper
  fs, exportfs: add exportfs_encode_inode_fh() helper
  fs, exportfs: escape nil dereference if no s_export_op present
  fs, epoll: add procfs fdinfo helper
  fs, eventfd: add procfs fdinfo helper
  procfs: add ability to plug in auxiliary fdinfo providers
  tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
  breakpoint selftests: print failure status instead of cause make error
  kcmp selftests: print fail status instead of cause make error
  kcmp selftests: make run_tests fix
  mem-hotplug selftests: print failure status instead of cause make error
  cpu-hotplug selftests: print failure status instead of cause make error
  mqueue selftests: print failure status instead of cause make error
  vm selftests: print failure status instead of cause make error
  ubifs: use prandom_bytes
  mtd: nandsim: use prandom_bytes
  ...

1 files changed, 20 insertions, 20 deletions

diff --git a/include/linux/init.h b/include/linux/init.h
index f63692d6902e..a799273714ac 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -182,16 +182,16 @@ extern bool initcall_debug;
  * can point at the same handler without causing duplicate-symbol build errors.
  */
 
-#define __define_initcall(level,fn,id) \
+#define __define_initcall(fn, id) \
         static initcall_t __initcall_##fn##id __used \
-        __attribute__((__section__(".initcall" level ".init"))) = fn
+        __attribute__((__section__(".initcall" #id ".init"))) = fn
 
 /*
  * Early initcalls run before initializing SMP.
  *
  * Only for built-in code, not modules.
  */
-#define early_initcall(fn)              __define_initcall("early",fn,early)
+#define early_initcall(fn)              __define_initcall(fn, early)
 
 /*
  * A "pure" initcall has no dependencies on anything else, and purely
@@ -200,23 +200,23 @@ extern bool initcall_debug;
  * This only exists for built-in code, not for modules.
  * Keep main.c:initcall_level_names[] in sync.
  */
-#define pure_initcall(fn)               __define_initcall("0",fn,0)
-
-#define core_initcall(fn)               __define_initcall("1",fn,1)
-#define core_initcall_sync(fn)          __define_initcall("1s",fn,1s)
-#define postcore_initcall(fn)           __define_initcall("2",fn,2)
-#define postcore_initcall_sync(fn)      __define_initcall("2s",fn,2s)
-#define arch_initcall(fn)               __define_initcall("3",fn,3)
-#define arch_initcall_sync(fn)          __define_initcall("3s",fn,3s)
-#define subsys_initcall(fn)             __define_initcall("4",fn,4)
-#define subsys_initcall_sync(fn)        __define_initcall("4s",fn,4s)
-#define fs_initcall(fn)                 __define_initcall("5",fn,5)
-#define fs_initcall_sync(fn)            __define_initcall("5s",fn,5s)
-#define rootfs_initcall(fn)             __define_initcall("rootfs",fn,rootfs)
-#define device_initcall(fn)             __define_initcall("6",fn,6)
-#define device_initcall_sync(fn)        __define_initcall("6s",fn,6s)
-#define late_initcall(fn)               __define_initcall("7",fn,7)
-#define late_initcall_sync(fn)          __define_initcall("7s",fn,7s)
+#define pure_initcall(fn)               __define_initcall(fn, 0)
+
+#define core_initcall(fn)               __define_initcall(fn, 1)
+#define core_initcall_sync(fn)          __define_initcall(fn, 1s)
+#define postcore_initcall(fn)           __define_initcall(fn, 2)
+#define postcore_initcall_sync(fn)      __define_initcall(fn, 2s)
+#define arch_initcall(fn)               __define_initcall(fn, 3)
+#define arch_initcall_sync(fn)          __define_initcall(fn, 3s)
+#define subsys_initcall(fn)             __define_initcall(fn, 4)
+#define subsys_initcall_sync(fn)        __define_initcall(fn, 4s)
+#define fs_initcall(fn)                 __define_initcall(fn, 5)
+#define fs_initcall_sync(fn)            __define_initcall(fn, 5s)
+#define rootfs_initcall(fn)             __define_initcall(fn, rootfs)
+#define device_initcall(fn)             __define_initcall(fn, 6)
+#define device_initcall_sync(fn)        __define_initcall(fn, 6s)
+#define late_initcall(fn)               __define_initcall(fn, 7)
+#define late_initcall_sync(fn)          __define_initcall(fn, 7s)
 
 #define __initcall(fn) device_initcall(fn)