Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / ia64 / kernel / gate.lds.S

diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index 44817d97ab43c91b7921ca83064d447da79034ad..3cb1abc00e24f585119def5e51cc72da0d47ea37 100644 (file)
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -20,6 +20,8 @@ SECTIONS
        .gnu.version_d          : { *(.gnu.version_d) }
        .gnu.version_r          : { *(.gnu.version_r) }
 
+       .note                   : { *(.note*) }         :readable       :note
+
        .dynamic                : { *(.dynamic) }       :readable       :dynamic
 
        /*
@@ -28,7 +30,7 @@ SECTIONS
         * the dynamic symbol table et al.  If this amount is insufficient,
         * ld -shared will barf.  Just increase it here.
         */
-       . = GATE_ADDR + 0x500;
+       . = GATE_ADDR + 0x600;
 
        .data.patch             : {
                __start_gate_mckinley_e9_patchlist = .;
@@ -83,6 +85,7 @@ PHDRS
        epc             PT_LOAD FILEHDR PHDRS   FLAGS(1);       /* PF_X */
 #endif
        dynamic         PT_DYNAMIC              FLAGS(4);       /* PF_R */
+       note            PT_NOTE                 FLAGS(4);       /* PF_R */
        unwind          PT_IA_64_UNWIND;
 }