Skip to content

Commit

Permalink
powerpc: Convert ipic_lock to raw_spinlock
Browse files Browse the repository at this point in the history 
ipic_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>
  • Loading branch information
Thomas Gleixner authored and Benjamin Herrenschmidt committed Feb 19, 2010
1 parent 6b9c9b8 commit a9e8bf2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions arch/powerpc/sysdev/ipic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

static struct ipic * primary_ipic;
static struct irq_chip ipic_level_irq_chip, ipic_edge_irq_chip;
static DEFINE_SPINLOCK(ipic_lock);
static DEFINE_RAW_SPINLOCK(ipic_lock);

static struct ipic_info ipic_info[] = {
[1] = {
Expand Down Expand Up @@ -530,13 +530,13 @@ static void ipic_unmask_irq(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&ipic_lock, flags);
raw_spin_lock_irqsave(&ipic_lock, flags);

temp = ipic_read(ipic->regs, ipic_info[src].mask);
temp |= (1 << (31 - ipic_info[src].bit));
ipic_write(ipic->regs, ipic_info[src].mask, temp);

spin_unlock_irqrestore(&ipic_lock, flags);
raw_spin_unlock_irqrestore(&ipic_lock, flags);
}

static void ipic_mask_irq(unsigned int virq)
Expand All @@ -546,7 +546,7 @@ static void ipic_mask_irq(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&ipic_lock, flags);
raw_spin_lock_irqsave(&ipic_lock, flags);

temp = ipic_read(ipic->regs, ipic_info[src].mask);
temp &= ~(1 << (31 - ipic_info[src].bit));
Expand All @@ -556,7 +556,7 @@ static void ipic_mask_irq(unsigned int virq)
* for nearly all cases. */
mb();

spin_unlock_irqrestore(&ipic_lock, flags);
raw_spin_unlock_irqrestore(&ipic_lock, flags);
}

static void ipic_ack_irq(unsigned int virq)
Expand All @@ -566,7 +566,7 @@ static void ipic_ack_irq(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&ipic_lock, flags);
raw_spin_lock_irqsave(&ipic_lock, flags);

temp = 1 << (31 - ipic_info[src].bit);
ipic_write(ipic->regs, ipic_info[src].ack, temp);
Expand All @@ -575,7 +575,7 @@ static void ipic_ack_irq(unsigned int virq)
* for nearly all cases. */
mb();

spin_unlock_irqrestore(&ipic_lock, flags);
raw_spin_unlock_irqrestore(&ipic_lock, flags);
}

static void ipic_mask_irq_and_ack(unsigned int virq)
Expand All @@ -585,7 +585,7 @@ static void ipic_mask_irq_and_ack(unsigned int virq)
unsigned long flags;
u32 temp;

spin_lock_irqsave(&ipic_lock, flags);
raw_spin_lock_irqsave(&ipic_lock, flags);

temp = ipic_read(ipic->regs, ipic_info[src].mask);
temp &= ~(1 << (31 - ipic_info[src].bit));
Expand All @@ -598,7 +598,7 @@ static void ipic_mask_irq_and_ack(unsigned int virq)
* for nearly all cases. */
mb();

spin_unlock_irqrestore(&ipic_lock, flags);
raw_spin_unlock_irqrestore(&ipic_lock, flags);
}

static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
Expand Down

0 comments on commit a9e8bf2

Please sign in to comment.