From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Jul 2008 22:28:10 +0000 (-0700)
Subject: Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux... 
X-Git-Tag: v2.6.27-rc1~1097
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d18bb9a548e550f3ced57618e75085fb3f173133;p=linux-2.6

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

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

d18bb9a548e550f3ced57618e75085fb3f173133
diff --cc arch/x86/kernel/vmlinux_32.lds.S
index 2674f57962,aa0855471c..cdb2363697
--- a/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 include/asm-generic/vmlinux.lds.h
index f1992dc5c4,dd2cc8122a..bf2851f939
--- a/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) = .;			\