Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6] / include / asm-generic / vmlinux.lds.h
index f3806a7..7440a0d 100644 (file)
@@ -9,18 +9,66 @@
 /* Align . to a 8 byte boundary equals to maximum function alignment. */
 #define ALIGN_FUNCTION()  . = ALIGN(8)
 
-#define RODATA                                                         \
-       . = ALIGN(4096);                                                \
+/* The actual configuration determine if the init/exit sections
+ * are handled as text/data or they can be discarded (which
+ * often happens at runtime)
+ */
+#ifdef CONFIG_HOTPLUG
+#define DEV_KEEP(sec)    *(.dev##sec)
+#define DEV_DISCARD(sec)
+#else
+#define DEV_KEEP(sec)
+#define DEV_DISCARD(sec) *(.dev##sec)
+#endif
+
+#ifdef CONFIG_HOTPLUG_CPU
+#define CPU_KEEP(sec)    *(.cpu##sec)
+#define CPU_DISCARD(sec)
+#else
+#define CPU_KEEP(sec)
+#define CPU_DISCARD(sec) *(.cpu##sec)
+#endif
+
+#if defined(CONFIG_MEMORY_HOTPLUG)
+#define MEM_KEEP(sec)    *(.mem##sec)
+#define MEM_DISCARD(sec)
+#else
+#define MEM_KEEP(sec)
+#define MEM_DISCARD(sec) *(.mem##sec)
+#endif
+
+
+/* .data section */
+#define DATA_DATA                                                      \
+       *(.data)                                                        \
+       *(.data.init.refok)                                             \
+       *(.ref.data)                                                    \
+       DEV_KEEP(init.data)                                             \
+       DEV_KEEP(exit.data)                                             \
+       CPU_KEEP(init.data)                                             \
+       CPU_KEEP(exit.data)                                             \
+       MEM_KEEP(init.data)                                             \
+       MEM_KEEP(exit.data)                                             \
+       . = ALIGN(8);                                                   \
+       VMLINUX_SYMBOL(__start___markers) = .;                          \
+       *(__markers)                                                    \
+       VMLINUX_SYMBOL(__stop___markers) = .;
+
+#define RO_DATA(align)                                                 \
+       . = ALIGN((align));                                             \
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                VMLINUX_SYMBOL(__start_rodata) = .;                     \
                *(.rodata) *(.rodata.*)                                 \
                *(__vermagic)           /* Kernel version magic */      \
+               *(__markers_strings)    /* Markers: strings */          \
        }                                                               \
                                                                        \
        .rodata1          : AT(ADDR(.rodata1) - LOAD_OFFSET) {          \
                *(.rodata1)                                             \
        }                                                               \
                                                                        \
+       BUG_TABLE                                                       \
+                                                                       \
        /* PCI quirks */                                                \
        .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
                VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \
                VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;          \
                *(.pci_fixup_resume)                                    \
                VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;            \
+               VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .;    \
+               *(.pci_fixup_resume_early)                              \
+               VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .;      \
+               VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .;         \
+               *(.pci_fixup_suspend)                                   \
+               VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .;           \
+       }                                                               \
+                                                                       \
+       /* Built-in firmware blobs */                                   \
+       .builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {      \
+               VMLINUX_SYMBOL(__start_builtin_fw) = .;                 \
+               *(.builtin_fw)                                          \
+               VMLINUX_SYMBOL(__end_builtin_fw) = .;                   \
        }                                                               \
                                                                        \
        /* RapidIO route ops */                                         \
                VMLINUX_SYMBOL(__end_rio_route_ops) = .;                \
        }                                                               \
                                                                        \
+       TRACEDATA                                                       \
+                                                                       \
        /* Kernel symbol table: Normal symbols */                       \
        __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
                VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
                *(__ksymtab_strings)                                    \
        }                                                               \
                                                                        \
+       /* __*init sections */                                          \
+       __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {         \
+               *(.ref.rodata)                                          \
+               DEV_KEEP(init.rodata)                                   \
+               DEV_KEEP(exit.rodata)                                   \
+               CPU_KEEP(init.rodata)                                   \
+               CPU_KEEP(exit.rodata)                                   \
+               MEM_KEEP(init.rodata)                                   \
+               MEM_KEEP(exit.rodata)                                   \
+       }                                                               \
+                                                                       \
        /* Built-in module parameters. */                               \
        __param : AT(ADDR(__param) - LOAD_OFFSET) {                     \
                VMLINUX_SYMBOL(__start___param) = .;                    \
                *(__param)                                              \
                VMLINUX_SYMBOL(__stop___param) = .;                     \
+               . = ALIGN((align));                                     \
                VMLINUX_SYMBOL(__end_rodata) = .;                       \
        }                                                               \
-                                                                       \
-       . = ALIGN(4096);
+       . = ALIGN((align));
+
+/* RODATA provided for backward compatibility.
+ * All archs are supposed to use RO_DATA() */
+#define RODATA RO_DATA(4096)
 
 #define SECURITY_INIT                                                  \
        .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
                VMLINUX_SYMBOL(__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 */
+#define TEXT_TEXT                                                      \
+               ALIGN_FUNCTION();                                       \
+               *(.text.hot)                                            \
+               *(.text)                                                \
+               *(.ref.text)                                            \
+               *(.text.init.refok)                                     \
+               *(.exit.text.refok)                                     \
+       DEV_KEEP(init.text)                                             \
+       DEV_KEEP(exit.text)                                             \
+       CPU_KEEP(init.text)                                             \
+       CPU_KEEP(exit.text)                                             \
+       MEM_KEEP(init.text)                                             \
+       MEM_KEEP(exit.text)                                             \
+               *(.text.unlikely)
+
+
 /* sched.text is aling to function alignment to secure we have same
  * address even at second ld pass when generating System.map */
 #define SCHED_TEXT                                                     \
                *(.kprobes.text)                                        \
                VMLINUX_SYMBOL(__kprobes_text_end) = .;
 
+/* Section used for early init (in .S files) */
+#define HEAD_TEXT  *(.head.text)
+
+/* init and exit section handling */
+#define INIT_DATA                                                      \
+       *(.init.data)                                                   \
+       DEV_DISCARD(init.data)                                          \
+       DEV_DISCARD(init.rodata)                                        \
+       CPU_DISCARD(init.data)                                          \
+       CPU_DISCARD(init.rodata)                                        \
+       MEM_DISCARD(init.data)                                          \
+       MEM_DISCARD(init.rodata)
+
+#define INIT_TEXT                                                      \
+       *(.init.text)                                                   \
+       DEV_DISCARD(init.text)                                          \
+       CPU_DISCARD(init.text)                                          \
+       MEM_DISCARD(init.text)
+
+#define EXIT_DATA                                                      \
+       *(.exit.data)                                                   \
+       DEV_DISCARD(exit.data)                                          \
+       DEV_DISCARD(exit.rodata)                                        \
+       CPU_DISCARD(exit.data)                                          \
+       CPU_DISCARD(exit.rodata)                                        \
+       MEM_DISCARD(exit.data)                                          \
+       MEM_DISCARD(exit.rodata)
+
+#define EXIT_TEXT                                                      \
+       *(.exit.text)                                                   \
+       DEV_DISCARD(exit.text)                                          \
+       CPU_DISCARD(exit.text)                                          \
+       MEM_DISCARD(exit.text)
+
                /* DWARF debug sections.
                Symbols in the DWARF debugging sections are relative to
                the beginning of the section so we begin them at 0.  */
                .stab.indexstr 0 : { *(.stab.indexstr) }                \
                .comment 0 : { *(.comment) }
 
+#ifdef CONFIG_GENERIC_BUG
 #define BUG_TABLE                                                      \
        . = ALIGN(8);                                                   \
        __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \
-               __start___bug_table = .;                                \
+               VMLINUX_SYMBOL(__start___bug_table) = .;                \
                *(__bug_table)                                          \
-               __stop___bug_table = .;                                 \
+               VMLINUX_SYMBOL(__stop___bug_table) = .;                 \
        }
+#else
+#define BUG_TABLE
+#endif
+
+#ifdef CONFIG_PM_TRACE
+#define TRACEDATA                                                      \
+       . = ALIGN(4);                                                   \
+       .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {               \
+               VMLINUX_SYMBOL(__tracedata_start) = .;                  \
+               *(.tracedata)                                           \
+               VMLINUX_SYMBOL(__tracedata_end) = .;                    \
+       }
+#else
+#define TRACEDATA
+#endif
 
 #define NOTES                                                          \
-       .notes : { *(.note.*) } :note
+       .notes : AT(ADDR(.notes) - LOAD_OFFSET) {                       \
+               VMLINUX_SYMBOL(__start_notes) = .;                      \
+               *(.note.*)                                              \
+               VMLINUX_SYMBOL(__stop_notes) = .;                       \
+       }
 
 #define INITCALLS                                                      \
+       *(.initcallearly.init)                                          \
+       VMLINUX_SYMBOL(__early_initcall_end) = .;                       \
        *(.initcall0.init)                                              \
        *(.initcall0s.init)                                             \
        *(.initcall1.init)                                              \
        *(.initcall7.init)                                              \
        *(.initcall7s.init)
 
+#define PERCPU(align)                                                  \
+       . = ALIGN(align);                                               \
+       VMLINUX_SYMBOL(__per_cpu_start) = .;                            \
+       .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) {          \
+               *(.data.percpu.page_aligned)                            \
+               *(.data.percpu)                                         \
+               *(.data.percpu.shared_aligned)                          \
+       }                                                               \
+       VMLINUX_SYMBOL(__per_cpu_end) = .;