Merge branch 'linus' into core/rodata

diff --combined arch/parisc/kernel/vmlinux.lds.S
index ff7d4ff4675a26ae198ee309061c0d638bd877d9,2e516b871752d818a09622c0f14104aed429254c..1a3b6ccd362064e80b65412a62eee7e7b0f2182d
--- 1/arch/parisc/kernel/vmlinux.lds.S
--- 2/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@@ -50,6 -50,7 +50,7 @@@ SECTION
  
        _text = .;              /* Text and read-only data */
        .text ALIGN(16) : {
+               HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
                LOCK_TEXT
@@@ -66,6 -67,7 +67,6 @@@
        _etext = .;
  
        RODATA
 -      BUG_TABLE
  
        /* writeable */
        /* Make sure this is page aligned so