15 files changed, 76 insertions, 77 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index e1a1b11473e2..424e9257c9a0 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -54,7 +54,7 @@ static int simeth_close(struct net_device *dev);
 static int simeth_tx(struct sk_buff *skb, struct net_device *dev);
 static int simeth_rx(struct net_device *dev);
 static struct net_device_stats *simeth_get_stats(struct net_device *dev);
-static irqreturn_t simeth_interrupt(int irq, void *dev_id, struct pt_regs * regs);
+static irqreturn_t simeth_interrupt(int irq, void *dev_id);
 static void set_multicast_list(struct net_device *dev);
 static int simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr);
 
@@ -87,7 +87,7 @@ static int simeth_debug;		/* set to 1 to get debug information */
  */
 static struct notifier_block simeth_dev_notifier = {
         simeth_device_event,
-        0
+        NULL
 };
 
 
@@ -497,7 +497,7 @@ simeth_rx(struct net_device *dev)
  * Interrupt handler (Yes, we can do it too !!!)
  */
 static irqreturn_t
-simeth_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+simeth_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
 
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 8f0a16a79a67..bb87682bbb1b 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -103,7 +103,7 @@ simscsi_interrupt (unsigned long val)
 
         while ((sc = queue[rd].sc) != 0) {
                 atomic_dec(&num_reqs);
-                queue[rd].sc = 0;
+                queue[rd].sc = NULL;
                 if (DBG)
                         printk("simscsi_interrupt: done with %ld\n", sc->serial_number);
                 (*sc->scsi_done)(sc);
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 246eb3d3757a..caab986af70c 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -92,7 +92,7 @@ static struct serial_uart_config uart_config[] = {
         { "ST16650V2", 32, UART_CLEAR_FIFO | UART_USE_FIFO |
                   UART_STARTECH },
         { "TI16750", 64, UART_CLEAR_FIFO | UART_USE_FIFO},
-        { 0, 0}
+        { NULL, 0}
 };
 
 struct tty_driver *hp_simserial_driver;
@@ -130,7 +130,7 @@ static void rs_start(struct tty_struct *tty)
 #endif
 }
 
-static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
+static  void receive_chars(struct tty_struct *tty)
 {
         unsigned char ch;
         static unsigned char seen_esc = 0;
@@ -152,7 +152,7 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
                                                 ch = ia64_ssc(0, 0, 0, 0,
                                                               SSC_GETCHAR);
                                         while (!ch);
-                                        handle_sysrq(ch, regs, NULL);
+                                        handle_sysrq(ch, NULL);
                                 }
 #endif
                                 seen_esc = 0;
@@ -170,7 +170,7 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
 /*
  * This is the serial driver's interrupt routine for a single port
  */
-static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
 {
         struct async_struct * info;
 
@@ -187,7 +187,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * r
          * pretty simple in our case, because we only get interrupts
          * on inbound traffic
          */
-        receive_chars(info->tty, regs);
+        receive_chars(info->tty);
         return IRQ_HANDLED;
 }
 
@@ -555,7 +555,7 @@ static void shutdown(struct async_struct * info)
 
                 if (info->xmit.buf) {
                         free_page((unsigned long) info->xmit.buf);
-                        info->xmit.buf = 0;
+                        info->xmit.buf = NULL;
                 }
 
                 if (info->tty) set_bit(TTY_IO_ERROR, &info->tty->flags);
@@ -628,7 +628,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty);
         if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
         info->event = 0;
-        info->tty = 0;
+        info->tty = NULL;
         if (info->blocked_open) {
                 if (info->close_delay)
                         schedule_timeout_interruptible(info->close_delay);
@@ -668,7 +668,7 @@ static void rs_hangup(struct tty_struct *tty)
         info->event = 0;
         state->count = 0;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -714,7 +714,7 @@ startup(struct async_struct *info)
 {
         unsigned long flags;
         int     retval=0;
-        irqreturn_t (*handler)(int, void *, struct pt_regs *);
+        irq_handler_t handler;
         struct serial_state *state= info->state;
         unsigned long page;
 
@@ -769,7 +769,7 @@ startup(struct async_struct *info)
         /*
          * Insert serial port into IRQ chain.
          */
-        info->prev_port = 0;
+        info->prev_port = NULL;
         info->next_port = IRQ_ports[state->irq];
         if (info->next_port)
                 info->next_port->prev_port = info;
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 7852382de2fa..f07c0864b0b4 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -194,8 +194,11 @@ void fixup_irqs(void)
          */
         for (irq=0; irq < NR_IRQS; irq++) {
                 if (vectors_in_migration[irq]) {
+                        struct pt_regs *old_regs = set_irq_regs(NULL);
+
                         vectors_in_migration[irq]=0;
-                        __do_IRQ(irq, NULL);
+                        __do_IRQ(irq);
+                        set_irq_regs(old_regs);
                 }
         }
 
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index ab2d19c3661f..68339dd0c9e2 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -138,6 +138,7 @@ void destroy_irq(unsigned int irq)
 void
 ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
 {
+        struct pt_regs *old_regs = set_irq_regs(regs);
         unsigned long saved_tpr;
 
 #if IRQ_DEBUG
@@ -183,7 +184,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
 
-                        __do_IRQ(local_vector_to_irq(vector), regs);
+                        __do_IRQ(local_vector_to_irq(vector));
 
                         /*
                          * Disable interrupts and send EOI:
@@ -200,6 +201,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
          * come through until ia64_eoi() has been done.
          */
         irq_exit();
+        set_irq_regs(old_regs);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -224,6 +226,8 @@ void ia64_process_pending_intr(void)
           */
         while (vector != IA64_SPURIOUS_INT_VECTOR) {
                 if (!IS_RESCHEDULE(vector)) {
+                        struct pt_regs *old_regs = set_irq_regs(NULL);
+
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
 
@@ -234,7 +238,8 @@ void ia64_process_pending_intr(void)
                          * Probably could shared code.
                          */
                         vectors_in_migration[local_vector_to_irq(vector)]=0;
-                        __do_IRQ(local_vector_to_irq(vector), NULL);
+                        __do_IRQ(local_vector_to_irq(vector));
+                        set_irq_regs(old_regs);
 
                         /*
                          * Disable interrupts and send EOI
@@ -251,7 +256,7 @@ void ia64_process_pending_intr(void)
 
 
 #ifdef CONFIG_SMP
-extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);
+extern irqreturn_t handle_IPI (int irq, void *dev_id);
 
 static struct irqaction ipi_irqaction = {
         .handler =      handle_IPI,
diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c
index d4a546aa5048..9620822270a6 100644
--- a/arch/ia64/kernel/machvec.c
+++ b/arch/ia64/kernel/machvec.c
@@ -60,7 +60,7 @@ machvec_setup (char **arg)
 EXPORT_SYMBOL(machvec_setup);
 
 void
-machvec_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
+machvec_timer_interrupt (int irq, void *dev_id)
 {
 }
 EXPORT_SYMBOL(machvec_timer_interrupt);
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 663230183254..7cfa63a98cb3 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -499,7 +499,7 @@ int cpe_vector = -1;
 int ia64_cpe_irq = -1;
 
 static irqreturn_t
-ia64_mca_cpe_int_handler (int cpe_irq, void *arg, struct pt_regs *ptregs)
+ia64_mca_cpe_int_handler (int cpe_irq, void *arg)
 {
         static unsigned long    cpe_history[CPE_HISTORY_LENGTH];
         static int              index;
@@ -744,7 +744,7 @@ ia64_mca_wakeup_all(void)
  *  Outputs :   None
  */
 static irqreturn_t
-ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
+ia64_mca_rendez_int_handler(int rendez_irq, void *arg)
 {
         unsigned long flags;
         int cpu = smp_processor_id();
@@ -753,8 +753,8 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
 
         /* Mask all interrupts */
         local_irq_save(flags);
-        if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", regs, (long)&nd, 0, 0)
-                        == NOTIFY_STOP)
+        if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", get_irq_regs(),
+                       (long)&nd, 0, 0) == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
         ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_DONE;
@@ -763,16 +763,16 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
          */
         ia64_sal_mc_rendez();
 
-        if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", regs, (long)&nd, 0, 0)
-                        == NOTIFY_STOP)
+        if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", get_irq_regs(),
+                       (long)&nd, 0, 0) == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
         /* Wait for the monarch cpu to exit. */
         while (monarch_cpu != -1)
                cpu_relax();     /* spin until monarch leaves */
 
-        if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", regs, (long)&nd, 0, 0)
-                        == NOTIFY_STOP)
+        if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", get_irq_regs(),
+                       (long)&nd, 0, 0) == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
         /* Enable all interrupts */
@@ -791,12 +791,11 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *regs)
  *
  *  Inputs  :   wakeup_irq  (Wakeup-interrupt bit)
  *      arg             (Interrupt handler specific argument)
- *      ptregs          (Exception frame at the time of the interrupt)
  *  Outputs :   None
  *
  */
 static irqreturn_t
-ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg, struct pt_regs *ptregs)
+ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg)
 {
         return IRQ_HANDLED;
 }
@@ -1261,13 +1260,12 @@ static DECLARE_WORK(cmc_enable_work, ia64_mca_cmc_vector_enable_keventd, NULL);
  * Inputs
  *      interrupt number
  *      client data arg ptr
- *      saved registers ptr
  *
  * Outputs
  *      None
  */
 static irqreturn_t
-ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs)
+ia64_mca_cmc_int_handler(int cmc_irq, void *arg)
 {
         static unsigned long    cmc_history[CMC_HISTORY_LENGTH];
         static int              index;
@@ -1336,12 +1334,11 @@ out:
  * Inputs
  *      interrupt number
  *      client data arg ptr
- *      saved registers ptr
  * Outputs
  *      handled
  */
 static irqreturn_t
-ia64_mca_cmc_int_caller(int cmc_irq, void *arg, struct pt_regs *ptregs)
+ia64_mca_cmc_int_caller(int cmc_irq, void *arg)
 {
         static int start_count = -1;
         unsigned int cpuid;
@@ -1352,7 +1349,7 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg, struct pt_regs *ptregs)
         if (start_count == -1)
                 start_count = IA64_LOG_COUNT(SAL_INFO_TYPE_CMC);
 
-        ia64_mca_cmc_int_handler(cmc_irq, arg, ptregs);
+        ia64_mca_cmc_int_handler(cmc_irq, arg);
 
         for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
 
@@ -1403,14 +1400,13 @@ ia64_mca_cmc_poll (unsigned long dummy)
  * Inputs
  *      interrupt number
  *      client data arg ptr
- *      saved registers ptr
  * Outputs
  *      handled
  */
 #ifdef CONFIG_ACPI
 
 static irqreturn_t
-ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
+ia64_mca_cpe_int_caller(int cpe_irq, void *arg)
 {
         static int start_count = -1;
         static int poll_time = MIN_CPE_POLL_INTERVAL;
@@ -1422,7 +1418,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
         if (start_count == -1)
                 start_count = IA64_LOG_COUNT(SAL_INFO_TYPE_CPE);
 
-        ia64_mca_cpe_int_handler(cpe_irq, arg, ptregs);
+        ia64_mca_cpe_int_handler(cpe_irq, arg);
 
         for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
 
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 62e07f906e05..41169a9bc301 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -45,7 +45,7 @@ static struct time_interpolator itc_interpolator = {
 };
 
 static irqreturn_t
-timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
+timer_interrupt (int irq, void *dev_id)
 {
         unsigned long new_itm;
 
@@ -53,7 +53,7 @@ timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                 return IRQ_HANDLED;
         }
 
-        platform_timer_interrupt(irq, dev_id, regs);
+        platform_timer_interrupt(irq, dev_id);
 
         new_itm = local_cpu_data->itm_next;
 
@@ -61,10 +61,10 @@ timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                 printk(KERN_ERR "Oops: timer tick before it's due (itc=%lx,itm=%lx)\n",
                        ia64_get_itc(), new_itm);
 
-        profile_tick(CPU_PROFILING, regs);
+        profile_tick(CPU_PROFILING);
 
         while (1) {
-                update_process_times(user_mode(regs));
+                update_process_times(user_mode(get_irq_regs()));
 
                 new_itm += local_cpu_data->itm_delta;
 
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 96fb81e6321f..abca6bd7962f 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -22,7 +22,7 @@
 void hubiio_crb_error_handler(struct hubdev_info *hubdev_info);
 extern void bte_crb_error_handler(cnodeid_t, int, int, ioerror_t *,
                                   int);
-static irqreturn_t hub_eint_handler(int irq, void *arg, struct pt_regs *ep)
+static irqreturn_t hub_eint_handler(int irq, void *arg)
 {
         struct hubdev_info *hubdev_info;
         struct ia64_sal_retval ret_stuff;
@@ -178,7 +178,7 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info)
  */
 void hub_error_init(struct hubdev_info *hubdev_info)
 {
-        if (request_irq(SGI_II_ERROR, (void *)hub_eint_handler, IRQF_SHARED,
+        if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,
                         "SN_hub_error", (void *)hubdev_info))
                 printk("hub_error_init: Failed to request_irq for 0x%p\n",
                     hubdev_info);
diff --git a/arch/ia64/sn/kernel/sn2/timer_interrupt.c b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
index fa7f69945917..103d6ea8e94b 100644
--- a/arch/ia64/sn/kernel/sn2/timer_interrupt.c
+++ b/arch/ia64/sn/kernel/sn2/timer_interrupt.c
@@ -36,7 +36,7 @@ extern irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 #define SN_LB_INT_WAR_INTERVAL 100
 
-void sn_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+void sn_timer_interrupt(int irq, void *dev_id)
 {
         /* LED blinking */
         if (!pda->hb_count--) {
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 4d026f9dd98b..fa96dfc0e1aa 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -222,7 +222,7 @@ xpc_timeout_partition_disengage_request(unsigned long data)
  * Notify the heartbeat check thread that an IRQ has been received.
  */
 static irqreturn_t
-xpc_act_IRQ_handler(int irq, void *dev_id, struct pt_regs *regs)
+xpc_act_IRQ_handler(int irq, void *dev_id)
 {
         atomic_inc(&xpc_act_IRQ_rcvd);
         wake_up_interruptible(&xpc_act_IRQ_wq);
@@ -607,12 +607,9 @@ xpc_activate_partition(struct xpc_partition *part)
  *      irq - Interrupt ReQuest number. NOT USED.
  *
  *      dev_id - partid of IPI's potential sender.
- *
- *      regs - processor's context before the processor entered
- *             interrupt code. NOT USED.
  */
 irqreturn_t
-xpc_notify_IRQ_handler(int irq, void *dev_id, struct pt_regs *regs)
+xpc_notify_IRQ_handler(int irq, void *dev_id)
 {
         partid_t partid = (partid_t) (u64) dev_id;
         struct xpc_partition *part = &xpc_partitions[partid];
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_ate.c b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
index 5eb1e1e078b4..935029fc400d 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
@@ -126,7 +126,7 @@ int pcibr_ate_alloc(struct pcibus_info *pcibus_info, int count)
  * Setup an Address Translation Entry as specified.  Use either the Bridge
  * internal maps or the external map RAM, as appropriate.
  */
-static inline u64 *pcibr_ate_addr(struct pcibus_info *pcibus_info,
+static inline u64 __iomem *pcibr_ate_addr(struct pcibus_info *pcibus_info,
                                        int ate_index)
 {
         if (ate_index < pcibus_info->pbi_int_ate_size) {
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 838c93c9a16a..27dd7df0f446 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -95,7 +95,7 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
  * bridge sends an error interrupt.
  */
 static irqreturn_t
-pcibr_error_intr_handler(int irq, void *arg, struct pt_regs *regs)
+pcibr_error_intr_handler(int irq, void *arg)
 {
         struct pcibus_info *soft = (struct pcibus_info *)arg;
 
@@ -138,7 +138,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
         /*
          * register the bridge's error interrupt handler
          */
-        if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler,
+        if (request_irq(SGI_PCIASIC_ERROR, pcibr_error_intr_handler,
                         IRQF_SHARED, "PCIBR error", (void *)(soft))) {
                 printk(KERN_WARNING
                        "pcibr cannot allocate interrupt for error handler\n");
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index c36b0f5affb3..8a2cb4e691fd 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -550,13 +550,12 @@ tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)
  * tioca_error_intr_handler - SGI TIO CA error interrupt handler
  * @irq: unused
  * @arg: pointer to tioca_common struct for the given CA
- * @pt: unused
  *
  * Handle a CA error interrupt.  Simply a wrapper around a SAL call which
  * defers processing to the SGI prom.
  */
 static irqreturn_t
-tioca_error_intr_handler(int irq, void *arg, struct pt_regs *pt)
+tioca_error_intr_handler(int irq, void *arg)
 {
         struct tioca_common *soft = arg;
         struct ia64_sal_retval ret_stuff;
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index af7171adcd2c..46e16dcf5971 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -53,7 +53,7 @@
  */
 
 static void inline
-tioce_mmr_war_pre(struct tioce_kernel *kern, void *mmr_addr)
+tioce_mmr_war_pre(struct tioce_kernel *kern, void __iomem *mmr_addr)
 {
         u64 mmr_base;
         u64 mmr_offset;
@@ -62,7 +62,7 @@ tioce_mmr_war_pre(struct tioce_kernel *kern, void *mmr_addr)
                 return;
 
         mmr_base = kern->ce_common->ce_pcibus.bs_base;
-        mmr_offset = (u64)mmr_addr - mmr_base;
+        mmr_offset = (unsigned long)mmr_addr - mmr_base;
 
         if (mmr_offset < 0x45000) {
                 u64 mmr_war_offset;
@@ -79,7 +79,7 @@ tioce_mmr_war_pre(struct tioce_kernel *kern, void *mmr_addr)
 }
 
 static void inline
-tioce_mmr_war_post(struct tioce_kernel *kern, void *mmr_addr)
+tioce_mmr_war_post(struct tioce_kernel *kern, void __iomem *mmr_addr)
 {
         u64 mmr_base;
         u64 mmr_offset;
@@ -88,7 +88,7 @@ tioce_mmr_war_post(struct tioce_kernel *kern, void *mmr_addr)
                 return;
 
         mmr_base = kern->ce_common->ce_pcibus.bs_base;
-        mmr_offset = (u64)mmr_addr - mmr_base;
+        mmr_offset = (unsigned long)mmr_addr - mmr_base;
 
         if (mmr_offset < 0x45000) {
                 if (mmr_offset == 0x100)
@@ -223,7 +223,7 @@ tioce_dma_d64(unsigned long ct_addr, int dma_flags)
  * @pci_dev.
  */
 static inline void
-pcidev_to_tioce(struct pci_dev *pdev, struct tioce **base,
+pcidev_to_tioce(struct pci_dev *pdev, struct tioce __iomem **base,
                 struct tioce_kernel **kernel, int *port)
 {
         struct pcidev_info *pcidev_info;
@@ -235,7 +235,7 @@ pcidev_to_tioce(struct pci_dev *pdev, struct tioce **base,
         ce_kernel = (struct tioce_kernel *)ce_common->ce_kernel_private;
 
         if (base)
-                *base = (struct tioce *)ce_common->ce_pcibus.bs_base;
+                *base = (struct tioce __iomem *)ce_common->ce_pcibus.bs_base;
         if (kernel)
                 *kernel = ce_kernel;
 
@@ -275,13 +275,13 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,
         u64 pagesize;
         int msi_capable, msi_wanted;
         u64 *ate_shadow;
-        u64 *ate_reg;
+        u64 __iomem *ate_reg;
         u64 addr;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
         u64 bus_base;
         struct tioce_dmamap *map;
 
-        ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base;
+        ce_mmr = (struct tioce __iomem *)ce_kern->ce_common->ce_pcibus.bs_base;
 
         switch (type) {
         case TIOCE_ATE_M32:
@@ -386,7 +386,7 @@ tioce_dma_d32(struct pci_dev *pdev, u64 ct_addr, int dma_flags)
 {
         int dma_ok;
         int port;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
         struct tioce_kernel *ce_kern;
         u64 ct_upper;
         u64 ct_lower;
@@ -461,7 +461,7 @@ tioce_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
         int i;
         int port;
         struct tioce_kernel *ce_kern;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
         unsigned long flags;
 
         bus_addr = tioce_dma_barrier(bus_addr, 0);
@@ -666,12 +666,11 @@ tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma
  * tioce_error_intr_handler - SGI TIO CE error interrupt handler
  * @irq: unused
  * @arg: pointer to tioce_common struct for the given CE
- * @pt: unused
  *
  * Handle a CE error interrupt.  Simply a wrapper around a SAL call which
  * defers processing to the SGI prom.
  */ static irqreturn_t
-tioce_error_intr_handler(int irq, void *arg, struct pt_regs *pt)
+tioce_error_intr_handler(int irq, void *arg)
 {
         struct tioce_common *soft = arg;
         struct ia64_sal_retval ret_stuff;
@@ -701,9 +700,9 @@ static void
 tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit)
 {
         int ate_index, last_ate, ps;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
 
-        ce_mmr = (struct tioce *)ce_kern->ce_common->ce_pcibus.bs_base;
+        ce_mmr = (struct tioce __iomem *)ce_kern->ce_common->ce_pcibus.bs_base;
         ps = ce_kern->ce_ate3240_pagesize;
         ate_index = ATE_PAGE(base, ps);
         last_ate = ate_index + ATE_NPAGES(base, limit-base+1, ps) - 1;
@@ -737,7 +736,7 @@ tioce_kern_init(struct tioce_common *tioce_common)
         int dev;
         u32 tmp;
         unsigned int seg, bus;
-        struct tioce *tioce_mmr;
+        struct tioce __iomem *tioce_mmr;
         struct tioce_kernel *tioce_kern;
 
         tioce_kern = kzalloc(sizeof(struct tioce_kernel), GFP_KERNEL);
@@ -768,7 +767,7 @@ tioce_kern_init(struct tioce_common *tioce_common)
          * the ate's.
          */
 
-        tioce_mmr = (struct tioce *)tioce_common->ce_pcibus.bs_base;
+        tioce_mmr = (struct tioce __iomem *)tioce_common->ce_pcibus.bs_base;
         tioce_mmr_clri(tioce_kern, &tioce_mmr->ce_ure_page_map,
                        CE_URE_PAGESIZE_MASK);
         tioce_mmr_seti(tioce_kern, &tioce_mmr->ce_ure_page_map,
@@ -859,7 +858,7 @@ tioce_force_interrupt(struct sn_irq_info *sn_irq_info)
         struct pcidev_info *pcidev_info;
         struct tioce_common *ce_common;
         struct tioce_kernel *ce_kern;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
         u64 force_int_val;
 
         if (!sn_irq_info->irq_bridge)
@@ -873,7 +872,7 @@ tioce_force_interrupt(struct sn_irq_info *sn_irq_info)
                 return;
 
         ce_common = (struct tioce_common *)pcidev_info->pdi_pcibus_info;
-        ce_mmr = (struct tioce *)ce_common->ce_pcibus.bs_base;
+        ce_mmr = (struct tioce __iomem *)ce_common->ce_pcibus.bs_base;
         ce_kern = (struct tioce_kernel *)ce_common->ce_kernel_private;
 
         /*
@@ -954,7 +953,7 @@ tioce_target_interrupt(struct sn_irq_info *sn_irq_info)
         struct pcidev_info *pcidev_info;
         struct tioce_common *ce_common;
         struct tioce_kernel *ce_kern;
-        struct tioce *ce_mmr;
+        struct tioce __iomem *ce_mmr;
         int bit;
         u64 vector;
 
@@ -963,7 +962,7 @@ tioce_target_interrupt(struct sn_irq_info *sn_irq_info)
                 return;
 
         ce_common = (struct tioce_common *)pcidev_info->pdi_pcibus_info;
-        ce_mmr = (struct tioce *)ce_common->ce_pcibus.bs_base;
+        ce_mmr = (struct tioce __iomem *)ce_common->ce_pcibus.bs_base;
         ce_kern = (struct tioce_kernel *)ce_common->ce_kernel_private;
 
         bit = sn_irq_info->irq_int_bit;
@@ -995,7 +994,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
         cnodeid_t my_cnode, mem_cnode;
         struct tioce_common *tioce_common;
         struct tioce_kernel *tioce_kern;
-        struct tioce *tioce_mmr;
+        struct tioce __iomem *tioce_mmr;
 
         /*
          * Allocate kernel bus soft and copy from prom.
@@ -1019,7 +1018,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
          * interrupt handler.
          */
 
-        tioce_mmr = (struct tioce *)tioce_common->ce_pcibus.bs_base;
+        tioce_mmr = (struct tioce __iomem *)tioce_common->ce_pcibus.bs_base;
         tioce_mmr_seti(tioce_kern, &tioce_mmr->ce_adm_int_status_alias, ~0ULL);
         tioce_mmr_seti(tioce_kern, &tioce_mmr->ce_adm_error_summary_alias,
                        ~0ULL);