summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-09-27 09:11:46 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:38:06 (GMT)
commitd6edff54c47a9279ea9c0ab5379e181c022c8cc5 (patch)
treee57ba9e2bfa163ed3d94d9b774609ded0aca864a /mm
parent3f082bc62014a5f9fc0f1ec72c475c1ba812200c (diff)
downloadlinux-fsl-qoriq-d6edff54c47a9279ea9c0ab5379e181c022c8cc5.tar.xz
mm: page_alloc: Use local_lock_on() instead of plain spinlock
The plain spinlock while sufficient does not update the local_lock internals. Use a proper local_lock function instead to ease debugging. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable-rt@vger.kernel.org
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 22a15d2..36c40eb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -235,9 +235,9 @@ static DEFINE_LOCAL_IRQ_LOCK(pa_lock);
#ifdef CONFIG_PREEMPT_RT_BASE
# define cpu_lock_irqsave(cpu, flags) \
- spin_lock_irqsave(&per_cpu(pa_lock, cpu).lock, flags)
+ local_lock_irqsave_on(pa_lock, flags, cpu)
# define cpu_unlock_irqrestore(cpu, flags) \
- spin_unlock_irqrestore(&per_cpu(pa_lock, cpu).lock, flags)
+ local_unlock_irqrestore_on(pa_lock, flags, cpu)
#else
# define cpu_lock_irqsave(cpu, flags) local_irq_save(flags)
# define cpu_unlock_irqrestore(cpu, flags) local_irq_restore(flags)