Merge tag 'v3.15' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / include / asm-generic / vmlinux.lds.h
index bc2121f..1e76a00 100644 (file)
 #define CLK_OF_TABLES()
 #endif
 
+#ifdef CONFIG_OF_RESERVED_MEM
+#define RESERVEDMEM_OF_TABLES()                                \
+       . = ALIGN(8);                                   \
+       VMLINUX_SYMBOL(__reservedmem_of_table) = .;     \
+       *(__reservedmem_of_table)                       \
+       *(__reservedmem_of_table_end)
+#else
+#define RESERVEDMEM_OF_TABLES()
+#endif
+
+#ifdef CONFIG_SMP
+#define CPU_METHOD_OF_TABLES() . = ALIGN(8);                               \
+                          VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
+                          *(__cpu_method_of_table)                         \
+                          VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;
+#else
+#define CPU_METHOD_OF_TABLES()
+#endif
+
 #define KERNEL_DTB()                                                   \
        STRUCT_ALIGN();                                                 \
        VMLINUX_SYMBOL(__dtb_start) = .;                                \
        TRACE_SYSCALLS()                                                \
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
+       RESERVEDMEM_OF_TABLES()                                         \
        CLKSRC_OF_TABLES()                                              \
+       CPU_METHOD_OF_TABLES()                                          \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()
 
                *(.security_initcall.init)                              \
                VMLINUX_SYMBOL(__security_initcall_end) = .;
 
+#ifdef CONFIG_MOD_SCHED
+#define COBAS_INITCALL                                                 \
+               VMLINUX_SYMBOL(__fw_modules_init_start) = .;            \
+               *(.fw.modules.init)                                     \
+               VMLINUX_SYMBOL(__fw_modules_init_end) = .;
+#else
+#define COBAS_INITCALL
+#endif
+
 #ifdef CONFIG_BLK_DEV_INITRD
 #define INIT_RAM_FS                                                    \
        . = ALIGN(4);                                                   \
                INIT_CALLS                                              \
                CON_INITCALL                                            \
                SECURITY_INITCALL                                       \
+               COBAS_INITCALL                                  \
                INIT_RAM_FS                                             \
        }