Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5d359c authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc/82xx: Convert pci_pic_lock to raw_spinlock 



Interrupt controllers' hooks are executed in the atomic context, so
they are not permitted to sleep (with RT kernels non-raw spinlocks are
sleepable). So, pci_pic_lock has to be a real (non-sleepable) spinlock.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 7e026f72

arch/powerpc/platforms/82xx/pq2ads-pci-pic.c

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include "pq2.h"



static DEFINE_SPINLOCK(pci_pic_lock);

static DEFINE_RAW_SPINLOCK(pci_pic_lock);



struct pq2ads_pci_pic {

	struct device_node *node;
@@ -45,12 +45,12 @@ static void pq2ads_pci_mask_irq(unsigned int virq) 


	if (irq != -1) {

		unsigned long flags;

		spin_lock_irqsave(&pci_pic_lock, flags);

		raw_spin_lock_irqsave(&pci_pic_lock, flags);



		setbits32(&priv->regs->mask, 1 << irq);

		mb();



		spin_unlock_irqrestore(&pci_pic_lock, flags);

		raw_spin_unlock_irqrestore(&pci_pic_lock, flags);

	}

}
@@ -62,9 +62,9 @@ static void pq2ads_pci_unmask_irq(unsigned int virq) 
	if (irq != -1) {

		unsigned long flags;



		spin_lock_irqsave(&pci_pic_lock, flags);

		raw_spin_lock_irqsave(&pci_pic_lock, flags);

		clrbits32(&priv->regs->mask, 1 << irq);

		spin_unlock_irqrestore(&pci_pic_lock, flags);

		raw_spin_unlock_irqrestore(&pci_pic_lock, flags);

	}

}