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 --cc arch/avr32/kernel/vmlinux.lds.S
Simple merge

diff --cc 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
@@@ -54,12 -56,15 +56,8 @@@ SECTION
        __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 --cc arch/x86/kernel/vmlinux_64.lds.S
Simple merge

diff --cc 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
@@@ -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) = .;                      \