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

Commit 3c97b5e9 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[PARISC] Move spinlock_t out of struct cpu_data 



Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 6858f3bf

arch/parisc/kernel/smp.c

+7 −4
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL; /* Bitmap of Present CP 
EXPORT_SYMBOL(cpu_online_map);

EXPORT_SYMBOL(cpu_possible_map);



DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;



struct smp_call_struct {

	void (*func) (void *info);
@@ -167,10 +168,11 @@ ipi_interrupt(int irq, void *dev_id) 
	mb();	/* Order interrupt and bit testing. */



	for (;;) {

		spin_lock_irqsave(&(p->lock),flags);

		spinlock_t *lock = &per_cpu(ipi_lock, this_cpu);

		spin_lock_irqsave(lock, flags);

		ops = p->pending_ipi;

		p->pending_ipi = 0;

		spin_unlock_irqrestore(&(p->lock),flags);

		spin_unlock_irqrestore(lock, flags);



		mb(); /* Order bit clearing and data access. */
@@ -275,12 +277,13 @@ static inline void 
ipi_send(int cpu, enum ipi_message_type op)

{

	struct cpuinfo_parisc *p = &cpu_data[cpu];

	spinlock_t *lock = &per_cpu(ipi_lock, cpu);

	unsigned long flags;



	spin_lock_irqsave(&(p->lock),flags);

	spin_lock_irqsave(lock, flags);

	p->pending_ipi |= 1 << op;

	gsc_writel(IPI_IRQ - CPU_IRQ_BASE, cpu_data[cpu].hpa);

	spin_unlock_irqrestore(&(p->lock),flags);

	spin_unlock_irqrestore(lock, flags);

}

include/asm-parisc/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct cpuinfo_parisc { 
	unsigned long hpa;          /* Host Physical address */

	unsigned long txn_addr;     /* MMIO addr of EIR or id_eid */

#ifdef CONFIG_SMP

	spinlock_t lock;            /* synchronization for ipi's */

	unsigned long pending_ipi;  /* bitmap of type ipi_message_type */

	unsigned long ipi_count;    /* number ipi Interrupts */

#endif