vserver 2.0-rc4

[linux-2.6.git] / arch / ppc64 / kernel / open_pic.c

diff --git a/arch/ppc64/kernel/open_pic.c b/arch/ppc64/kernel/open_pic.c
index 0eed791..656a493 100644 (file)
--- a/arch/ppc64/kernel/open_pic.c
+++ b/arch/ppc64/kernel/open_pic.c
@@ -168,7 +168,7 @@ void __init pSeries_init_openpic(void)
         struct device_node *np;
         int i;
         unsigned int *addrp;
-        unsigned char* chrp_int_ack_special = 0;
+        unsigned char* chrp_int_ack_special = NULL;
         unsigned char init_senses[NR_IRQS - NUM_ISA_INTERRUPTS];
         int nmi_irq = -1;
 #if defined(CONFIG_VT) && defined(CONFIG_ADB_KEYBOARD) && defined(XMON)
@@ -362,7 +362,6 @@ void __init openpic_init(int main_pic, int offset, unsigned char* chrp_ack,
        find_ISUs();
 
        /* Initialize timer interrupts */
-       ppc64_boot_msg(0x21, "OpenPic Timer");
        for (i = 0; i < OPENPIC_NUM_TIMERS; i++) {
                /* Disabled, Priority 0 */
                openpic_inittimer(i, 0, openpic_vec_timer+i);
@@ -372,7 +371,6 @@ void __init openpic_init(int main_pic, int offset, unsigned char* chrp_ack,
 
 #ifdef CONFIG_SMP
        /* Initialize IPI interrupts */
-       ppc64_boot_msg(0x22, "OpenPic IPI");
        openpic_test_broken_IPI();
        for (i = 0; i < OPENPIC_NUM_IPI; i++) {
                /* Disabled, Priority 10..13 */
@@ -384,8 +382,6 @@ void __init openpic_init(int main_pic, int offset, unsigned char* chrp_ack,
 #endif
 
        /* Initialize external interrupts */
-       ppc64_boot_msg(0x23, "OpenPic Ext");
-
        openpic_set_priority(0xf);
 
        /* SIOint (8259 cascade) is special */
@@ -420,7 +416,6 @@ void __init openpic_init(int main_pic, int offset, unsigned char* chrp_ack,
                irq_desc[i].handler = &open_pic;
 
        /* Initialize the spurious interrupt */
-       ppc64_boot_msg(0x24, "OpenPic Spurious");
        openpic_set_spurious(openpic_vec_spurious);
 
        openpic_set_priority(0);
@@ -591,7 +586,7 @@ static inline u32 physmask(u32 cpumask)
 void openpic_init_processor(u_int cpumask)
 {
        openpic_write(&OpenPIC->Global.Processor_Initialization,
-                     physmask(cpumask & cpus_coerce(cpu_online_map)));
+                     physmask(cpumask & cpus_addr(cpu_online_map)[0]));
 }
 
 #ifdef CONFIG_SMP
@@ -625,7 +620,7 @@ void openpic_cause_IPI(u_int ipi, u_int cpumask)
        CHECK_THIS_CPU;
        check_arg_ipi(ipi);
        openpic_write(&OpenPIC->THIS_CPU.IPI_Dispatch(ipi),
-                     physmask(cpumask & cpus_coerce(cpu_online_map)));
+                     physmask(cpumask & cpus_addr(cpu_online_map)[0]));
 }
 
 void openpic_request_IPIs(void)
@@ -642,13 +637,13 @@ void openpic_request_IPIs(void)
 
        /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
        request_irq(openpic_vec_ipi, openpic_ipi_action, SA_INTERRUPT,
-                   "IPI0 (call function)", 0);
+                   "IPI0 (call function)", NULL);
        request_irq(openpic_vec_ipi+1, openpic_ipi_action, SA_INTERRUPT,
-                  "IPI1 (reschedule)", 0);
+                  "IPI1 (reschedule)", NULL);
        request_irq(openpic_vec_ipi+2, openpic_ipi_action, SA_INTERRUPT,
-                  "IPI2 (unused)", 0);
+                  "IPI2 (unused)", NULL);
        request_irq(openpic_vec_ipi+3, openpic_ipi_action, SA_INTERRUPT,
-                  "IPI3 (debugger break)", 0);
+                  "IPI3 (debugger break)", NULL);
 
        for ( i = 0; i < OPENPIC_NUM_IPI ; i++ )
                openpic_enable_ipi(openpic_vec_ipi+i);
@@ -711,7 +706,7 @@ static void __init openpic_maptimer(u_int timer, u_int cpumask)
 {
        check_arg_timer(timer);
        openpic_write(&OpenPIC->Global.Timer[timer].Destination,
-                     physmask(cpumask & cpus_coerce(cpu_online_map)));
+                     physmask(cpumask & cpus_addr(cpu_online_map)[0]));
 }
 
 
@@ -844,7 +839,7 @@ static void openpic_set_affinity(unsigned int irq_nr, cpumask_t cpumask)
        cpumask_t tmp;
 
        cpus_and(tmp, cpumask, cpu_online_map);
-       openpic_mapirq(irq_nr - open_pic_irq_offset, physmask(cpus_coerce(tmp)));
+       openpic_mapirq(irq_nr - open_pic_irq_offset, physmask(cpus_addr(tmp)[0]));
 }
 
 #ifdef CONFIG_SMP