Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

* 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  move BUG_TABLE into RODATA

diff --combined arch/avr32/kernel/vmlinux.lds.S
index 5d25d8e,bc932c9..7910d41
--- 1/arch/avr32/kernel/vmlinux.lds.S
--- 2/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@@ -68,6 -68,14 +68,6 @@@ SECTION
                _evba = .;
                _text = .;
                *(.ex.text)
 -              . = 0x50;
 -              *(.tlbx.ex.text)
 -              . = 0x60;
 -              *(.tlbr.ex.text)
 -              . = 0x70;
 -              *(.tlbw.ex.text)
 -              . = 0x100;
 -              *(.scall.text)
                *(.irq.text)
                KPROBES_TEXT
                TEXT_TEXT
@@@ -85,8 -93,6 +85,6 @@@
                __stop___ex_table = .;
        }
  
-       BUG_TABLE
- 
        RODATA
  
        . = ALIGN(THREAD_SIZE);
@@@ -99,10 -105,6 +97,10 @@@
                 */
                *(.data.init_task)
  
 +              /* Then, the page-aligned data */
 +              . = ALIGN(PAGE_SIZE);
 +              *(.data.page_aligned)
 +
                /* Then, the cacheline aligned data */
                . = ALIGN(L1_CACHE_BYTES);
                *(.data.cacheline_aligned)

diff --combined arch/x86/kernel/vmlinux_32.lds.S
index 2674f57,aa08554..cdb2363
--- 1/arch/x86/kernel/vmlinux_32.lds.S
--- 2/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@@ -49,17 -49,22 +49,15 @@@ SECTION
        _etext = .;                     /* End of text section */
    } :text = 0x9090
  
+   NOTES :text :note
+ 
    . = ALIGN(16);              /* Exception table */
    __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
        __start___ex_table = .;
         *(__ex_table)
        __stop___ex_table = .;
-   }
- 
-   NOTES :text :note
- 
-   BUG_TABLE :text
+   } :text = 0x9090
  
 -  . = ALIGN(4);
 -  .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {
 -      __tracedata_start = .;
 -      *(.tracedata)
 -      __tracedata_end = .;
 -  }
 -
    RODATA
  
    /* writeable */

diff --combined arch/x86/kernel/vmlinux_64.lds.S
index fd246e2,d123747..63e5c1a
--- 1/arch/x86/kernel/vmlinux_64.lds.S
--- 2/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@@ -19,7 -19,7 +19,7 @@@ PHDRS 
        data PT_LOAD FLAGS(7);  /* RWE */
        user PT_LOAD FLAGS(7);  /* RWE */
        data.init PT_LOAD FLAGS(7);     /* RWE */
-       note PT_NOTE FLAGS(4);  /* R__ */
+       note PT_NOTE FLAGS(0);  /* ___ */
  }
  SECTIONS
  {
@@@ -40,19 -40,24 +40,17 @@@
        _etext = .;             /* End of text section */
    } :text = 0x9090
  
+   NOTES :text :note
+ 
    . = ALIGN(16);              /* Exception table */
    __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
        __start___ex_table = .;
         *(__ex_table)
        __stop___ex_table = .;
-   }
- 
-   NOTES :text :note
- 
-   BUG_TABLE :text
+   } :text = 0x9090
  
    RODATA
  
 -  . = ALIGN(4);
 -  .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {
 -      __tracedata_start = .;
 -      *(.tracedata)
 -      __tracedata_end = .;
 -  }
 -
    . = ALIGN(PAGE_SIZE);               /* Align data segment to page size boundary */
                                /* Data */
    .data : AT(ADDR(.data) - LOAD_OFFSET) {
@@@ -170,7 -175,6 +168,7 @@@
        *(.con_initcall.init)
    }
    __con_initcall_end = .;
 +  . = ALIGN(16);
    __x86cpuvendor_start = .;
    .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) {
        *(.x86cpuvendor.init)

diff --combined include/asm-generic/vmlinux.lds.h
index f1992dc,dd2cc81..bf2851f
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -67,6 -67,8 +67,8 @@@
                *(.rodata1)                                             \
        }                                                               \
                                                                        \
+       BUG_TABLE                                                       \
+                                                                       \
        /* PCI quirks */                                                \
        .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
                VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \
@@@ -93,8 -95,6 +95,8 @@@
                VMLINUX_SYMBOL(__end_rio_route_ops) = .;                \
        }                                                               \
                                                                        \
 +      TRACEDATA                                                       \
 +                                                                      \
        /* Kernel symbol table: Normal symbols */                       \
        __ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {         \
                VMLINUX_SYMBOL(__start___ksymtab) = .;                  \
@@@ -312,6 -312,7 +314,7 @@@
                .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) {             \
@@@ -319,19 -320,10 +322,22 @@@
                *(__bug_table)                                          \
                __stop___bug_table = .;                                 \
        }
+ #else
+ #define BUG_TABLE
+ #endif
  
 +#ifdef CONFIG_PM_TRACE
 +#define TRACEDATA                                                     \
 +      . = ALIGN(4);                                                   \
 +      .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {               \
 +              __tracedata_start = .;                                  \
 +              *(.tracedata)                                           \
 +              __tracedata_end = .;                                    \
 +      }
 +#else
 +#define TRACEDATA
 +#endif
 +
  #define NOTES                                                         \
        .notes : AT(ADDR(.notes) - LOAD_OFFSET) {                       \
                VMLINUX_SYMBOL(__start_notes) = .;                      \