Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index d0bcea7..3d7a6a9 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -203,6 +203,15 @@
 #define EARLYCON_TABLE()
 #endif
 
+#ifdef CONFIG_SECURITY
+#define LSM_TABLE()    . = ALIGN(8);                                   \
+                       __start_lsm_info = .;                           \
+                       KEEP(*(.lsm_info.init))                         \
+                       __end_lsm_info = .;
+#else
+#define LSM_TABLE()
+#endif
+
 #define ___OF_TABLE(cfg, name) _OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)  ___OF_TABLE(cfg, name)
 #define OF_TABLE(cfg, name)    __OF_TABLE(IS_ENABLED(cfg), name)
@@ -476,13 +485,6 @@
 #define RODATA          RO_DATA_SECTION(4096)
 #define RO_DATA(align)  RO_DATA_SECTION(align)
 
-#define SECURITY_INIT                                                  \
-       .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
-               __security_initcall_start = .;                          \
-               KEEP(*(.security_initcall.init))                        \
-               __security_initcall_end = .;                            \
-       }
-
 /*
  * .text section. Map to function alignment to avoid address changes
  * during second ld run in second ld pass when generating System.map
@@ -607,7 +609,8 @@
        IRQCHIP_OF_MATCH_TABLE()                                        \
        ACPI_PROBE_TABLE(irqchip)                                       \
        ACPI_PROBE_TABLE(timer)                                         \
-       EARLYCON_TABLE()
+       EARLYCON_TABLE()                                                \
+       LSM_TABLE()
 
 #define INIT_TEXT                                                      \
        *(.init.text .init.text.*)                                      \
@@ -796,11 +799,6 @@
                KEEP(*(.con_initcall.init))                             \
                __con_initcall_end = .;
 
-#define SECURITY_INITCALL                                              \
-               __security_initcall_start = .;                          \
-               KEEP(*(.security_initcall.init))                        \
-               __security_initcall_end = .;
-
 #ifdef CONFIG_BLK_DEV_INITRD
 #define INIT_RAM_FS                                                    \
        . = ALIGN(4);                                                   \
@@ -967,7 +965,6 @@
                INIT_SETUP(initsetup_align)                             \
                INIT_CALLS                                              \
                CON_INITCALL                                            \
-               SECURITY_INITCALL                                       \
                INIT_RAM_FS                                             \
        }