5 files changed, 10 insertions, 10 deletions

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 2b1e6c9a6e0e..45c9fa7d7545 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -109,7 +109,7 @@ static LIST_HEAD(appldata_ops_list);
  *
  * schedule work and reschedule timer
  */
-static void appldata_timer_function(unsigned long data, struct pt_regs *regs)
+static void appldata_timer_function(unsigned long data)
 {
         P_DEBUG("   -= Timer =-\n");
         P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(),
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c
index c49ab8c784d2..4faf96f8a834 100644
--- a/arch/s390/kernel/s390_ext.c
+++ b/arch/s390/kernel/s390_ext.c
@@ -117,8 +117,8 @@ void do_extint(struct pt_regs *regs, unsigned short code)
         int index;
         struct pt_regs *old_regs;
 
-        irq_enter();
         old_regs = set_irq_regs(regs);
+        irq_enter();
         asm volatile ("mc 0,0");
         if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
                 /**
@@ -134,8 +134,8 @@ void do_extint(struct pt_regs *regs, unsigned short code)
                                 p->handler(code);
                 }
         }
-        set_irq_regs(old_regs);
         irq_exit();
+        set_irq_regs(old_regs);
 }
 
 EXPORT_SYMBOL(register_external_interrupt);
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 1d7d3938b2b1..21baaf5496d6 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -209,11 +209,11 @@ static void list_add_sorted(struct vtimer_list *timer, struct list_head *head)
  * Do the callback functions of expired vtimer events.
  * Called from within the interrupt handler.
  */
-static void do_callbacks(struct list_head *cb_list, struct pt_regs *regs)
+static void do_callbacks(struct list_head *cb_list)
 {
         struct vtimer_queue *vt_list;
         struct vtimer_list *event, *tmp;
-        void (*fn)(unsigned long, struct pt_regs*);
+        void (*fn)(unsigned long);
         unsigned long data;
 
         if (list_empty(cb_list))
@@ -224,7 +224,7 @@ static void do_callbacks(struct list_head *cb_list, struct pt_regs *regs)
         list_for_each_entry_safe(event, tmp, cb_list, entry) {
                 fn = event->function;
                 data = event->data;
-                fn(data, regs);
+                fn(data);
 
                 if (!event->interval)
                         /* delete one shot timer */
@@ -275,7 +275,7 @@ static void do_cpu_timer_interrupt(__u16 error_code)
                 list_move_tail(&event->entry, &cb_list);
         }
         spin_unlock(&vt_list->lock);
-        do_callbacks(&cb_list, get_irq_regs());
+        do_callbacks(&cb_list);
 
         /* next event is first in list */
         spin_lock(&vt_list->lock);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index f18b1623cad7..8936e460a807 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -609,8 +609,8 @@ do_IRQ (struct pt_regs *regs)
         struct irb *irb;
         struct pt_regs *old_regs;
 
-        irq_enter ();
         old_regs = set_irq_regs(regs);
+        irq_enter();
         asm volatile ("mc 0,0");
         if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
                 /**
@@ -655,8 +655,8 @@ do_IRQ (struct pt_regs *regs)
                  * out of the sie which costs more cycles than it saves.
                  */
         } while (!MACHINE_IS_VM && tpi (NULL) != 0);
+        irq_exit();
         set_irq_regs(old_regs);
-        irq_exit ();
 }
 
 #ifdef CONFIG_CCW_CONSOLE
diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
index fcd6c256a2d1..30e5cbe570f2 100644
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
@@ -26,7 +26,7 @@ struct vtimer_list {
         spinlock_t lock;
         unsigned long magic;
 
-        void (*function)(unsigned long, struct pt_regs*);
+        void (*function)(unsigned long);
         unsigned long data;
 };