← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to arch/powerpc/platforms/powermac/pic.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/platforms/powermac/pic.c
84
84
 
85
85
static void pmac_mask_and_ack_irq(struct irq_data *d)
86
86
{
87
 
        unsigned int src = irq_map[d->irq].hwirq;
 
87
        unsigned int src = irqd_to_hwirq(d);
88
88
        unsigned long bit = 1UL << (src & 0x1f);
89
89
        int i = src >> 5;
90
90
        unsigned long flags;
106
106
 
107
107
static void pmac_ack_irq(struct irq_data *d)
108
108
{
109
 
        unsigned int src = irq_map[d->irq].hwirq;
 
109
        unsigned int src = irqd_to_hwirq(d);
110
110
        unsigned long bit = 1UL << (src & 0x1f);
111
111
        int i = src >> 5;
112
112
        unsigned long flags;
152
152
static unsigned int pmac_startup_irq(struct irq_data *d)
153
153
{
154
154
        unsigned long flags;
155
 
        unsigned int src = irq_map[d->irq].hwirq;
 
155
        unsigned int src = irqd_to_hwirq(d);
156
156
        unsigned long bit = 1UL << (src & 0x1f);
157
157
        int i = src >> 5;
158
158
 
169
169
static void pmac_mask_irq(struct irq_data *d)
170
170
{
171
171
        unsigned long flags;
172
 
        unsigned int src = irq_map[d->irq].hwirq;
 
172
        unsigned int src = irqd_to_hwirq(d);
173
173
 
174
174
        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
175
175
        __clear_bit(src, ppc_cached_irq_mask);
180
180
static void pmac_unmask_irq(struct irq_data *d)
181
181
{
182
182
        unsigned long flags;
183
 
        unsigned int src = irq_map[d->irq].hwirq;
 
183
        unsigned int src = irqd_to_hwirq(d);
184
184
 
185
185
        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
186
186
        __set_bit(src, ppc_cached_irq_mask);
193
193
        unsigned long flags;
194
194
 
195
195
        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
196
 
        __pmac_retrigger(irq_map[d->irq].hwirq);
 
196
        __pmac_retrigger(irqd_to_hwirq(d));
197
197
        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
198
198
        return 1;
199
199
}
239
239
        unsigned long bits = 0;
240
240
        unsigned long flags;
241
241
 
242
 
#ifdef CONFIG_SMP
243
 
        void psurge_smp_message_recv(void);
244
 
 
245
 
        /* IPI's are a hack on the powersurge -- Cort */
246
 
        if ( smp_processor_id() != 0 ) {
247
 
                psurge_smp_message_recv();
248
 
                return NO_IRQ_IGNORE;   /* ignore, already handled */
 
242
#ifdef CONFIG_PPC_PMAC32_PSURGE
 
243
        /* IPI's are a hack on the powersurge -- Cort */
 
244
        if (smp_processor_id() != 0) {
 
245
                return  psurge_secondary_virq;
249
246
        }
250
 
#endif /* CONFIG_SMP */
 
247
#endif /* CONFIG_PPC_PMAC32_PSURGE */
251
248
        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
252
249
        for (irq = max_real_irqs; (irq -= 32) >= 0; ) {
253
250
                int i = irq >> 5;
718
715
 
719
716
static int __init init_pmacpic_syscore(void)
720
717
{
721
 
        register_syscore_ops(&pmacpic_syscore_ops);
 
718
        if (pmac_irq_hw[0])
 
719
                register_syscore_ops(&pmacpic_syscore_ops);
722
720
        return 0;
723
721
}
724
722