3 files changed, 34 insertions, 14 deletions

diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 69268014dd8e..a3cab6d3ae02 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -50,8 +50,18 @@ SECTIONS
   .rela.got       : { *(.rela.got) }
   .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
   .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
+  .rel.plt : {
+        *(.rel.plt)
+        PROVIDE_HIDDEN(__rel_iplt_start = .);
+        *(.rel.iplt)
+        PROVIDE_HIDDEN(__rel_iplt_end = .);
+  }
+  .rela.plt : {
+        *(.rela.plt)
+        PROVIDE_HIDDEN(__rela_iplt_start = .);
+        *(.rela.iplt)
+        PROVIDE_HIDDEN(__rela_iplt_end = .);
+  }
   .init           : {
     KEEP (*(.init))
   } =0x90909090
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index a746e3037a5b..3f0ac9e0c966 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -334,7 +334,7 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
         irq_enter();
-        __do_IRQ(irq);
+        generic_handle_irq(irq);
         irq_exit();
         set_irq_regs(old_regs);
         return 1;
@@ -391,17 +391,10 @@ void __init init_IRQ(void)
 {
         int i;
 
-        irq_desc[TIMER_IRQ].status = IRQ_DISABLED;
-        irq_desc[TIMER_IRQ].action = NULL;
-        irq_desc[TIMER_IRQ].depth = 1;
-        irq_desc[TIMER_IRQ].chip = &SIGVTALRM_irq_type;
-        enable_irq(TIMER_IRQ);
+        set_irq_chip_and_handler(TIMER_IRQ, &SIGVTALRM_irq_type, handle_edge_irq);
+
         for (i = 1; i < NR_IRQS; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].action = NULL;
-                irq_desc[i].depth = 1;
-                irq_desc[i].chip = &normal_irq_type;
-                enable_irq(i);
+                set_irq_chip_and_handler(i, &normal_irq_type, handle_edge_irq);
         }
 }
 
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index ec6378550671..fbd99402d4d2 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -22,7 +22,7 @@ SECTIONS
   _text = .;
   _stext = .;
   __init_begin = .;
-  INIT_TEXT_SECTION(PAGE_SIZE)
+  INIT_TEXT_SECTION(0)
   . = ALIGN(PAGE_SIZE);
 
   .text      :
@@ -43,6 +43,23 @@ SECTIONS
         __syscall_stub_end = .;
   }
 
+  /*
+   * These are needed even in a static link, even if they wind up being empty.
+   * Newer glibc needs these __rel{,a}_iplt_{start,end} symbols.
+   */
+  .rel.plt : {
+        *(.rel.plt)
+        PROVIDE_HIDDEN(__rel_iplt_start = .);
+        *(.rel.iplt)
+        PROVIDE_HIDDEN(__rel_iplt_end = .);
+  }
+  .rela.plt : {
+        *(.rela.plt)
+        PROVIDE_HIDDEN(__rela_iplt_start = .);
+        *(.rela.iplt)
+        PROVIDE_HIDDEN(__rela_iplt_end = .);
+  }
+
   #include "asm/common.lds.S"
 
   init.data : { INIT_DATA }