asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc: Convert big_irq_lock to raw_spinlock

Browse source 
big_irq_lock needs to be a real spinlock in RT. Convert it to
raw_spinlock.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Thomas Gleixner 2010-02-18 02:22:24 +00:00 committed by Benjamin Herrenschmidt
parent 087d8c7d0c
commit f95e085b25
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/powerpc/kernel/irq.c
View file

@ -520,7 +520,7 @@ void do_softirq(void)
*/ */
static LIST_HEAD(irq_hosts); static LIST_HEAD(irq_hosts);
static DEFINE_SPINLOCK(irq_big_lock); static DEFINE_RAW_SPINLOCK(irq_big_lock);
static unsigned int revmap_trees_allocated; static unsigned int revmap_trees_allocated;
static DEFINE_MUTEX(revmap_trees_mutex); static DEFINE_MUTEX(revmap_trees_mutex);
struct irq_map_entry irq_map[NR_IRQS]; struct irq_map_entry irq_map[NR_IRQS];
@ -566,14 +566,14 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
if (host->ops->match == NULL) if (host->ops->match == NULL)
host->ops->match = default_irq_host_match; host->ops->match = default_irq_host_match;
spin_lock_irqsave(&irq_big_lock, flags); raw_spin_lock_irqsave(&irq_big_lock, flags);
/* If it's a legacy controller, check for duplicates and /* If it's a legacy controller, check for duplicates and
* mark it as allocated (we use irq 0 host pointer for that * mark it as allocated (we use irq 0 host pointer for that
*/ */
if (revmap_type == IRQ_HOST_MAP_LEGACY) { if (revmap_type == IRQ_HOST_MAP_LEGACY) {
if (irq_map[0].host != NULL) { if (irq_map[0].host != NULL) {
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
/* If we are early boot, we can't free the structure, /* If we are early boot, we can't free the structure,
* too bad... * too bad...
* this will be fixed once slab is made available early * this will be fixed once slab is made available early
@ -587,7 +587,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
} }
list_add(&host->link, &irq_hosts); list_add(&host->link, &irq_hosts);
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
/* Additional setups per revmap type */ /* Additional setups per revmap type */
switch(revmap_type) { switch(revmap_type) {
@ -638,13 +638,13 @@ struct irq_host *irq_find_host(struct device_node *node)
* the absence of a device node. This isn't a problem so far * the absence of a device node. This isn't a problem so far
* yet though... * yet though...
*/ */
spin_lock_irqsave(&irq_big_lock, flags); raw_spin_lock_irqsave(&irq_big_lock, flags);
list_for_each_entry(h, &irq_hosts, link) list_for_each_entry(h, &irq_hosts, link)
if (h->ops->match(h, node)) { if (h->ops->match(h, node)) {
found = h; found = h;
break; break;
} }
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
return found; return found;
} }
EXPORT_SYMBOL_GPL(irq_find_host); EXPORT_SYMBOL_GPL(irq_find_host);
@ -1013,7 +1013,7 @@ unsigned int irq_alloc_virt(struct irq_host *host,
if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS)) if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS))
return NO_IRQ; return NO_IRQ;
spin_lock_irqsave(&irq_big_lock, flags); raw_spin_lock_irqsave(&irq_big_lock, flags);
/* Use hint for 1 interrupt if any */ /* Use hint for 1 interrupt if any */
if (count == 1 && hint >= NUM_ISA_INTERRUPTS && if (count == 1 && hint >= NUM_ISA_INTERRUPTS &&
@ -1037,7 +1037,7 @@ unsigned int irq_alloc_virt(struct irq_host *host,
} }
} }
if (found == NO_IRQ) { if (found == NO_IRQ) {
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
return NO_IRQ; return NO_IRQ;
} }
hint_found: hint_found:
@ -1046,7 +1046,7 @@ unsigned int irq_alloc_virt(struct irq_host *host,
smp_wmb(); smp_wmb();
irq_map[i].host = host; irq_map[i].host = host;
} }
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
return found; return found;
} }
@ -1058,7 +1058,7 @@ void irq_free_virt(unsigned int virq, unsigned int count)
WARN_ON (virq < NUM_ISA_INTERRUPTS); WARN_ON (virq < NUM_ISA_INTERRUPTS);
WARN_ON (count == 0 || (virq + count) > irq_virq_count); WARN_ON (count == 0 || (virq + count) > irq_virq_count);
spin_lock_irqsave(&irq_big_lock, flags); raw_spin_lock_irqsave(&irq_big_lock, flags);
for (i = virq; i < (virq + count); i++) { for (i = virq; i < (virq + count); i++) {
struct irq_host *host; struct irq_host *host;
@ -1071,7 +1071,7 @@ void irq_free_virt(unsigned int virq, unsigned int count)
smp_wmb(); smp_wmb();
irq_map[i].host = NULL; irq_map[i].host = NULL;
} }
spin_unlock_irqrestore(&irq_big_lock, flags); raw_spin_unlock_irqrestore(&irq_big_lock, flags);
} }
int arch_early_irq_init(void) int arch_early_irq_init(void)