3.12-stable patches

added patches:
	e1000e-fix-compiler-warnings.patch
	mm-mempolicy.c-fix-mempolicy-printing-in-numa_maps.patch

diff --git a/queue-3.12/e1000e-fix-compiler-warnings.patch b/queue-3.12/e1000e-fix-compiler-warnings.patch
new file mode 100644 (file)
index 0000000..38940b7
--- /dev/null
+++ b/queue-3.12/e1000e-fix-compiler-warnings.patch
@@ -0,0 +1,57 @@
+From 9e6c3b63399dd424d33a34e08b77f2cab0b84cdc Mon Sep 17 00:00:00 2001
+From: David Ertman <davidx.m.ertman@intel.com>
+Date: Sat, 14 Dec 2013 07:18:18 +0000
+Subject: e1000e: fix compiler warnings
+
+From: David Ertman <davidx.m.ertman@intel.com>
+
+commit 9e6c3b63399dd424d33a34e08b77f2cab0b84cdc upstream.
+
+This patch is to fix a compiler warning of __bad_udelay due to a value
+of >999 being passed as a parameter to udelay() in the function
+e1000e_phy_has_link_generic().  This affects the gcc compiler when
+it is given a flag of -O3 and the icc compiler.
+
+This patch is also making the change from mdelay() to msleep() in the
+same function, since it was determined though code inspection that this
+function is never called in atomic context.
+
+Signed-off-by: David Ertman <davidx.m.ertman@intel.com>
+Acked-by: Bruce Allan <bruce.w.allan@intel.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/intel/e1000e/phy.c |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/ethernet/intel/e1000e/phy.c
++++ b/drivers/net/ethernet/intel/e1000e/phy.c
+@@ -1757,19 +1757,23 @@ s32 e1000e_phy_has_link_generic(struct e
+                * it across the board.
+                */
+               ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);
+-              if (ret_val)
++              if (ret_val) {
+                       /* If the first read fails, another entity may have
+                        * ownership of the resources, wait and try again to
+                        * see if they have relinquished the resources yet.
+                        */
+-                      udelay(usec_interval);
++                      if (usec_interval >= 1000)
++                              msleep(usec_interval / 1000);
++                      else
++                              udelay(usec_interval);
++              }
+               ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);
+               if (ret_val)
+                       break;
+               if (phy_status & BMSR_LSTATUS)
+                       break;
+               if (usec_interval >= 1000)
+-                      mdelay(usec_interval / 1000);
++                      msleep(usec_interval / 1000);
+               else
+                       udelay(usec_interval);
+       }

diff --git a/queue-3.12/mm-mempolicy.c-fix-mempolicy-printing-in-numa_maps.patch b/queue-3.12/mm-mempolicy.c-fix-mempolicy-printing-in-numa_maps.patch
new file mode 100644 (file)
index 0000000..54e58fa
--- /dev/null
+++ b/queue-3.12/mm-mempolicy.c-fix-mempolicy-printing-in-numa_maps.patch
@@ -0,0 +1,44 @@
+From 8790c71a18e5d2d93532ae250bcf5eddbba729cd Mon Sep 17 00:00:00 2001
+From: David Rientjes <rientjes@google.com>
+Date: Thu, 30 Jan 2014 15:46:08 -0800
+Subject: mm/mempolicy.c: fix mempolicy printing in numa_maps
+
+From: David Rientjes <rientjes@google.com>
+
+commit 8790c71a18e5d2d93532ae250bcf5eddbba729cd upstream.
+
+As a result of commit 5606e3877ad8 ("mm: numa: Migrate on reference
+policy"), /proc/<pid>/numa_maps prints the mempolicy for any <pid> as
+"prefer:N" for the local node, N, of the process reading the file.
+
+This should only be printed when the mempolicy of <pid> is
+MPOL_PREFERRED for node N.
+
+If the process is actually only using the default mempolicy for local
+node allocation, make sure "default" is printed as expected.
+
+Signed-off-by: David Rientjes <rientjes@google.com>
+Reported-by: Robert Lippert <rlippert@google.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Acked-by: Mel Gorman <mgorman@suse.de>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: <stable@vger.kernel.org>   [3.7+]
+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>
+
+---
+ mm/mempolicy.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mm/mempolicy.c
++++ b/mm/mempolicy.c
+@@ -2857,7 +2857,7 @@ int mpol_to_str(char *buffer, int maxlen
+        */
+       VM_BUG_ON(maxlen < strlen("interleave") + strlen("relative") + 16);
+ 
+-      if (!pol || pol == &default_policy)
++      if (!pol || pol == &default_policy || (pol->flags & MPOL_F_MORON))
+               mode = MPOL_DEFAULT;
+       else
+               mode = pol->mode;

diff --git a/queue-3.12/series b/queue-3.12/series
index 6a97f5ba564368d4c0f6fc158926e464a546c338..56b369ffc13a81ecc48f633e4c95c39dfa9dc6df 100644 (file)
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -3,3 +3,5 @@ md-raid5-fix-long-standing-problem-with-bitmap-handling-on-write-failure.patch
 drm-nouveau-bios-fix-offset-calculation-for-bmpv1-bioses.patch
 mm-hugetlbfs-fix-hugetlbfs-optimization.patch
 e752x_edac-fix-pci_dev-usage-count.patch
+e1000e-fix-compiler-warnings.patch
+mm-mempolicy.c-fix-mempolicy-printing-in-numa_maps.patch