← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/ia64/kernel/mca.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/ia64/kernel/mca.c
582
582
        /* Get the CPE error record and log it */
583
583
        ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE);
584
584
 
 
585
        local_irq_disable();
 
586
 
585
587
        return IRQ_HANDLED;
586
588
}
587
589
 
2123
2125
        cpe_poll_timer.function = ia64_mca_cpe_poll;
2124
2126
 
2125
2127
        {
2126
 
                struct irq_desc *desc;
2127
2128
                unsigned int irq;
2128
2129
 
2129
2130
                if (cpe_vector >= 0) {
2131
2132
                        irq = local_vector_to_irq(cpe_vector);
2132
2133
                        if (irq > 0) {
2133
2134
                                cpe_poll_enabled = 0;
2134
 
                                desc = irq_desc + irq;
2135
 
                                desc->status |= IRQ_PER_CPU;
 
2135
                                irq_set_status_flags(irq, IRQ_PER_CPU);
2136
2136
                                setup_irq(irq, &mca_cpe_irqaction);
2137
2137
                                ia64_cpe_irq = irq;
2138
2138
                                ia64_mca_register_cpev(cpe_vector);