22 files changed, 34 insertions, 34 deletions

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index da677f829f76..63af36cf7f6e 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -49,15 +49,15 @@ select_smp_affinity(unsigned int irq)
         static int last_cpu;
         int cpu = last_cpu + 1;
 
-        if (!irq_desc[irq].handler->set_affinity || irq_user_affinity[irq])
+        if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])
                 return 1;
 
         while (!cpu_possible(cpu))
                 cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
         last_cpu = cpu;
 
-        irq_affinity[irq] = cpumask_of_cpu(cpu);
-        irq_desc[irq].handler->set_affinity(irq, cpumask_of_cpu(cpu));
+        irq_desc[irq].affinity = cpumask_of_cpu(cpu);
+        irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu));
         return 0;
 }
 #endif /* CONFIG_SMP */
@@ -93,7 +93,7 @@ show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);
 #endif
-                seq_printf(p, " %14s", irq_desc[irq].handler->typename);
+                seq_printf(p, " %14s", irq_desc[irq].chip->typename);
                 seq_printf(p, "  %c%s",
                         (action->flags & SA_INTERRUPT)?'+':' ',
                         action->name);
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 9d34ce26e5ef..f20f2dff9c43 100644
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -233,7 +233,7 @@ void __init
 init_rtc_irq(void)
 {
         irq_desc[RTC_IRQ].status = IRQ_DISABLED;
-        irq_desc[RTC_IRQ].handler = &rtc_irq_type;
+        irq_desc[RTC_IRQ].chip = &rtc_irq_type;
         setup_irq(RTC_IRQ, &timer_irqaction);
 }
 
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index b188683b83fd..ac893bd48036 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -109,7 +109,7 @@ init_i8259a_irqs(void)
 
         for (i = 0; i < 16; i++) {
                 irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].handler = &i8259a_irq_type;
+                irq_desc[i].chip = &i8259a_irq_type;
         }
 
         setup_irq(2, &cascade);
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index 146a20b9e3d5..3b581415bab0 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -120,7 +120,7 @@ init_pyxis_irqs(unsigned long ignore_mask)
                 if ((ignore_mask >> i) & 1)
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &pyxis_irq_type;
+                irq_desc[i].chip = &pyxis_irq_type;
         }
 
         setup_irq(16+7, &isa_cascade_irqaction);
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c
index 0a87e466918c..8e4d121f84cc 100644
--- a/arch/alpha/kernel/irq_srm.c
+++ b/arch/alpha/kernel/irq_srm.c
@@ -67,7 +67,7 @@ init_srm_irqs(long max, unsigned long ignore_mask)
                 if (i < 64 && ((ignore_mask >> i) & 1))
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &srm_irq_type;
+                irq_desc[i].chip = &srm_irq_type;
         }
 }
 
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 2a8b364c822e..4ea6711e55aa 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -124,12 +124,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
 
 void
 pcibios_align_resource(void *data, struct resource *res,
-                       unsigned long size, unsigned long align)
+                       resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
         struct pci_controller *hose = dev->sysdata;
         unsigned long alignto;
-        unsigned long start = res->start;
+        resource_size_t start = res->start;
 
         if (res->flags & IORESOURCE_IO) {
                 /* Make sure we start at our min on all hoses */
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 558b83368559..254c507a608c 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -481,7 +481,7 @@ register_cpus(void)
                 struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
-                register_cpu(p, i, NULL);
+                register_cpu(p, i);
         }
         return 0;
 }
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index d7f0e97fe56f..1a1a2c7a3d94 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -144,7 +144,7 @@ alcor_init_irq(void)
                 if (i >= 16+20 && i <= 16+30)
                         continue;
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &alcor_irq_type;
+                irq_desc[i].chip = &alcor_irq_type;
         }
         i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
 
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 8e3374d34c95..8c9e443d93ad 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -124,7 +124,7 @@ common_init_irq(void (*srm_dev_int)(unsigned long v, struct pt_regs *r))
 
                 for (i = 16; i < 35; ++i) {
                         irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                        irq_desc[i].handler = &cabriolet_irq_type;
+                        irq_desc[i].chip = &cabriolet_irq_type;
                 }
         }
 
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index d5da6b1b28ee..b28c8f1c6e10 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -300,7 +300,7 @@ init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax)
         long i;
         for (i = imin; i <= imax; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = ops;
+                irq_desc[i].chip = ops;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 61a79c354f0b..aeb8e0277905 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -137,7 +137,7 @@ eb64p_init_irq(void)
 
         for (i = 16; i < 32; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &eb64p_irq_type;
+                irq_desc[i].chip = &eb64p_irq_type;
         }               
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index bd6e5f0e43c7..64a785baf53a 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -154,7 +154,7 @@ eiger_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &eiger_irq_type;
+                irq_desc[i].chip = &eiger_irq_type;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index fcabb7c96a16..0148e095638f 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -206,11 +206,11 @@ jensen_init_irq(void)
 {
         init_i8259a_irqs();
 
-        irq_desc[1].handler = &jensen_local_irq_type;
-        irq_desc[4].handler = &jensen_local_irq_type;
-        irq_desc[3].handler = &jensen_local_irq_type;
-        irq_desc[7].handler = &jensen_local_irq_type;
-        irq_desc[9].handler = &jensen_local_irq_type;
+        irq_desc[1].chip = &jensen_local_irq_type;
+        irq_desc[4].chip = &jensen_local_irq_type;
+        irq_desc[3].chip = &jensen_local_irq_type;
+        irq_desc[7].chip = &jensen_local_irq_type;
+        irq_desc[9].chip = &jensen_local_irq_type;
 
         common_init_isa_dma();
 }
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index e32fee505220..36d215954376 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -303,7 +303,7 @@ init_io7_irqs(struct io7 *io7,
         /* Set up the lsi irqs.  */
         for (i = 0; i < 128; ++i) {
                 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].handler = lsi_ops;
+                irq_desc[base + i].chip = lsi_ops;
         }
 
         /* Disable the implemented irqs in hardware.  */
@@ -317,7 +317,7 @@ init_io7_irqs(struct io7 *io7,
         /* Set up the msi irqs.  */
         for (i = 128; i < (128 + 512); ++i) {
                 irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].handler = msi_ops;
+                irq_desc[base + i].chip = msi_ops;
         }
 
         for (i = 0; i < 16; ++i)
@@ -335,7 +335,7 @@ marvel_init_irq(void)
         /* Reserve the legacy irqs.  */
         for (i = 0; i < 16; ++i) {
                 irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].handler = &marvel_legacy_irq_type;
+                irq_desc[i].chip = &marvel_legacy_irq_type;
         }
 
         /* Init the io7 irqs.  */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index d78a0daa6168..b741600e3761 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -117,7 +117,7 @@ mikasa_init_irq(void)
 
         for (i = 16; i < 32; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &mikasa_irq_type;
+                irq_desc[i].chip = &mikasa_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 65061f5d7410..55db02d318d7 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -139,7 +139,7 @@ noritake_init_irq(void)
 
         for (i = 16; i < 48; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &noritake_irq_type;
+                irq_desc[i].chip = &noritake_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 05888a02a604..949607e3d6fb 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -180,7 +180,7 @@ rawhide_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &rawhide_irq_type;
+                irq_desc[i].chip = &rawhide_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index 58404243057b..6ae506052635 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -117,7 +117,7 @@ rx164_init_irq(void)
         rx164_update_irq_hw(0);
         for (i = 16; i < 40; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &rx164_irq_type;
+                irq_desc[i].chip = &rx164_irq_type;
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index a7ff84474ace..24dea40c9bfe 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -537,7 +537,7 @@ sable_lynx_init_irq(int nr_irqs)
 
         for (i = 0; i < nr_irqs; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &sable_lynx_irq_type;
+                irq_desc[i].chip = &sable_lynx_irq_type;
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 7955bdfc2db0..2c75cd1fd81a 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -154,7 +154,7 @@ takara_init_irq(void)
 
         for (i = 16; i < 128; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = &takara_irq_type;
+                irq_desc[i].chip = &takara_irq_type;
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 2551fb49ae09..13f3ed8ed7ac 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -189,7 +189,7 @@ init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax)
         long i;
         for (i = imin; i <= imax; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].handler = ops;
+                irq_desc[i].chip = ops;
         }
 }
 
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 1553f470246e..22c5798fe083 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -199,14 +199,14 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)
                 if (i == 2)
                         continue;
                 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].handler = &wildfire_irq_type;
+                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
         }
 
         irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-        irq_desc[36+irq_bias].handler = &wildfire_irq_type;
+        irq_desc[36+irq_bias].chip = &wildfire_irq_type;
         for (i = 40; i < 64; ++i) {
                 irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].handler = &wildfire_irq_type;
+                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
         }
 
         setup_irq(32+irq_bias, &isa_enable);