diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:55:48 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:55:48 -0500 |
| commit | c73ce5ccac1f56db82961194c3570d11d44db4e7 (patch) | |
| tree | 7c4765589f9ec18f8d2e15b7fcc7bb23a716881a | |
| parent | 05ecd91f9d066018984ba91b5fde52d74ffef0ac (diff) | |
| download | 4.9-rt-patches-c73ce5ccac1f56db82961194c3570d11d44db4e7.tar.gz | |
mm: drop pgalloc local lock patch now upstreamrt-v4.8-15054-g9ffc66941df2
| -rw-r--r-- | patches/mm-page-alloc-use-local-lock-on-target-cpu.patch | 27 | ||||
| -rw-r--r-- | patches/series | 1 |
2 files changed, 0 insertions, 28 deletions
diff --git a/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch b/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch deleted file mode 100644 index a208a1650cc82..0000000000000 --- a/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch +++ /dev/null @@ -1,27 +0,0 @@ -Subject: mm: page_alloc: Use local_lock_on() instead of plain spinlock -From: Thomas Gleixner <tglx@linutronix.de> -Date: Thu, 27 Sep 2012 11:11:46 +0200 - -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> - ---- - mm/page_alloc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -281,9 +281,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) diff --git a/patches/series b/patches/series index e76efbc7d6799..49793962a672c 100644 --- a/patches/series +++ b/patches/series @@ -243,7 +243,6 @@ slub-enable-irqs-for-no-wait.patch slub-disable-SLUB_CPU_PARTIAL.patch # MM -mm-page-alloc-use-local-lock-on-target-cpu.patch mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch mm-memcontrol-do_not_disable_irq.patch mm-memcontrol-mem_cgroup_migrate-replace-another-loc.patch |