Merge branch 'linus' into core/rodata

2008-06-16 11:24:00 +02:00
parent 6360b1fbb4 066519068a
commit 6d72b7952f
934 changed files with 13676 additions and 7304 deletions
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -50,6 +50,7 @@ SECTIONS

 	_text = .;		/* Text and read-only data */
 	.text ALIGN(16) : {
+		HEAD_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT