Merge git://github.com/rustyrussell/linux

Pull module and param updates from Rusty Russell:
 "I'm getting married next week, and then honeymoon until 6th May.  I'll
  be offline from next week, except to post the compulsory pictures if
  Alex shaves her head..."

I'm sure Rusty can take time off from his honeymoon if something comes
up. And here's the explanation about head shaving:

	http://baldalex.org/

in case you wondered and wanted to support another insane caper or
Rusty's involving shaving.

What *is* it with Rusty and shaving, anyway?

* git://github.com/rustyrussell/linux:
  module: Remove module size limit
  module: move __module_get and try_module_get() out of line.
  params: <level>_initcall-like kernel parameters
  module_param: remove support for bool parameters which are really int.
  module: add kernel param to force disable module load

1 files changed, 14 insertions, 21 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 798603e8ec38..8aeadf6b553a 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -616,30 +616,23 @@
                 *(.init.setup)                                          \
                 VMLINUX_SYMBOL(__setup_end) = .;
 
-#define INITCALLS                                                       \
-        *(.initcallearly.init)                                          \
-        VMLINUX_SYMBOL(__early_initcall_end) = .;                       \
-        *(.initcall0.init)                                              \
-        *(.initcall0s.init)                                             \
-        *(.initcall1.init)                                              \
-        *(.initcall1s.init)                                             \
-        *(.initcall2.init)                                              \
-        *(.initcall2s.init)                                             \
-        *(.initcall3.init)                                              \
-        *(.initcall3s.init)                                             \
-        *(.initcall4.init)                                              \
-        *(.initcall4s.init)                                             \
-        *(.initcall5.init)                                              \
-        *(.initcall5s.init)                                             \
-        *(.initcallrootfs.init)                                         \
-        *(.initcall6.init)                                              \
-        *(.initcall6s.init)                                             \
-        *(.initcall7.init)                                              \
-        *(.initcall7s.init)
+#define INIT_CALLS_LEVEL(level)                                         \
+                VMLINUX_SYMBOL(__initcall##level##_start) = .;          \
+                *(.initcall##level##.init)                              \
+                *(.initcall##level##s.init)                             \
 
 #define INIT_CALLS                                                      \
                 VMLINUX_SYMBOL(__initcall_start) = .;                   \
-                INITCALLS                                               \
+                *(.initcallearly.init)                                  \
+                INIT_CALLS_LEVEL(0)                                     \
+                INIT_CALLS_LEVEL(1)                                     \
+                INIT_CALLS_LEVEL(2)                                     \
+                INIT_CALLS_LEVEL(3)                                     \
+                INIT_CALLS_LEVEL(4)                                     \
+                INIT_CALLS_LEVEL(5)                                     \
+                INIT_CALLS_LEVEL(rootfs)                                \
+                INIT_CALLS_LEVEL(6)                                     \
+                INIT_CALLS_LEVEL(7)                                     \
                 VMLINUX_SYMBOL(__initcall_end) = .;
 
 #define CON_INITCALL                                                    \