A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'v2.6.37-rc2' into sched/core

Browse source 
Merge reason: Move to a .37-rc base.

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2010-11-18 13:22:14 +01:00
commit 92fd4d4d67
8825 changed files with 918407 additions and 472752 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/irq/irqdesc.c
View file

@ -393,3 +393,18 @@ unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
struct irq_desc *desc = irq_to_desc(irq);
return desc ? desc->kstat_irqs[cpu] : 0;
}
#ifdef CONFIG_GENERIC_HARDIRQS
unsigned int kstat_irqs(unsigned int irq)
{
struct irq_desc *desc = irq_to_desc(irq);
int cpu;
int sum = 0;
if (!desc)
return 0;
for_each_possible_cpu(cpu)
sum += desc->kstat_irqs[cpu];
return sum;
}
#endif /* CONFIG_GENERIC_HARDIRQS */

4
kernel/irq/manage.c
View file

@ -324,6 +324,10 @@ void enable_irq(unsigned int irq)
if (!desc)
return;
if (WARN(!desc->irq_data.chip || !desc->irq_data.chip->irq_enable,
KERN_ERR "enable_irq before setup/request_irq: irq %u\n", irq))
return;
chip_bus_lock(desc);
raw_spin_lock_irqsave(&desc->lock, flags);
__enable_irq(desc, irq, false);