delete queue-3.12/sched-numa-skip-inaccessible-vmas.patch for now

diff --git a/queue-3.12/sched-numa-skip-inaccessible-vmas.patch b/queue-3.12/sched-numa-skip-inaccessible-vmas.patch
deleted file mode 100644 (file)
index cf47c4b..0000000
--- a/queue-3.12/sched-numa-skip-inaccessible-vmas.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3c67f474558748b604e247d92b55dfe89654c81d Mon Sep 17 00:00:00 2001
-From: Mel Gorman <mgorman@suse.de>
-Date: Wed, 18 Dec 2013 17:08:40 -0800
-Subject: sched: numa: skip inaccessible VMAs
-
-From: Mel Gorman <mgorman@suse.de>
-
-commit 3c67f474558748b604e247d92b55dfe89654c81d upstream.
-
-Inaccessible VMA should not be trapping NUMA hint faults. Skip them.
-
-Signed-off-by: Mel Gorman <mgorman@suse.de>
-Reviewed-by: Rik van Riel <riel@redhat.com>
-Cc: Alex Thorlton <athorlton@sgi.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/sched/fair.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -974,6 +974,13 @@ void task_numa_work(struct callback_head
-               if (vma->vm_end - vma->vm_start < HPAGE_SIZE)
-                       continue;
- 
-+              /*
-+               * Skip inaccessible VMAs to avoid any confusion between
-+               * PROT_NONE and NUMA hinting ptes
-+               */
-+              if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
-+                      continue;
-+
-               do {
-                       start = max(start, vma->vm_start);
-                       end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE);

diff --git a/queue-3.12/series b/queue-3.12/series
index 0b84d932547fa0bebf7cb5d656b37fb00a078125..f5afc855a0b9b5ee87cee171164199a5bb485ea1 100644 (file)
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -55,7 +55,6 @@ ext4-do-not-reserve-clusters-when-fs-doesn-t-support-extents.patch
 ext4-fix-deadlock-when-writing-in-enospc-conditions.patch
 ext4-add-explicit-casts-when-masking-cluster-sizes.patch
 ext4-fix-fitrim-in-no-journal-mode.patch
-sched-numa-skip-inaccessible-vmas.patch
 sched-rt-fix-rq-s-cpupri-leak-while-enqueue-dequeue-child-rt-entities.patch
 firewire-sbp2-bring-back-write-same-support.patch
 net_dma-mark-broken.patch