3.4-stable patches

added patches:
	drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
	fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch

diff --git a/queue-3.4/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch b/queue-3.4/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
new file mode 100644 (file)
index 0000000..80776ed
--- /dev/null
+++ b/queue-3.4/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
@@ -0,0 +1,34 @@
+From d03874c881a049a50e12f285077ab1f9fc2686e1 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 6 Mar 2014 18:09:52 -0500
+Subject: drm/radeon/atom: select the proper number of lanes in
+ transmitter setup
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit d03874c881a049a50e12f285077ab1f9fc2686e1 upstream.
+
+We need to check for DVI vs. HDMI when setting up duallink since
+HDMI is single link only.  Fixes 4k modes on newer asics.
+
+bug:
+https://bugs.freedesktop.org/show_bug.cgi?id=75223
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/atombios_encoders.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/atombios_encoders.c
++++ b/drivers/gpu/drm/radeon/atombios_encoders.c
+@@ -1048,7 +1048,7 @@ atombios_dig_transmitter_setup(struct dr
+                       }
+                       if (is_dp)
+                               args.v5.ucLaneNum = dp_lane_count;
+-                      else if (radeon_encoder->pixel_clock > 165000)
++                      else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
+                               args.v5.ucLaneNum = 8;
+                       else
+                               args.v5.ucLaneNum = 4;

diff --git a/queue-3.4/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch b/queue-3.4/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch
new file mode 100644 (file)
index 0000000..1f63b39
--- /dev/null
+++ b/queue-3.4/fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch
@@ -0,0 +1,55 @@
+From 70335abb2689c8cd5df91bf2d95a65649addf50b Mon Sep 17 00:00:00 2001
+From: Artem Fetishev <artem_fetishev@epam.com>
+Date: Mon, 10 Mar 2014 15:49:45 -0700
+Subject: fs/proc/base.c: fix GPF in /proc/$PID/map_files
+
+From: Artem Fetishev <artem_fetishev@epam.com>
+
+commit 70335abb2689c8cd5df91bf2d95a65649addf50b upstream.
+
+The expected logic of proc_map_files_get_link() is either to return 0
+and initialize 'path' or return an error and leave 'path' uninitialized.
+
+By the time dname_to_vma_addr() returns 0 the corresponding vma may have
+already be gone.  In this case the path is not initialized but the
+return value is still 0.  This results in 'general protection fault'
+inside d_path().
+
+Steps to reproduce:
+
+  CONFIG_CHECKPOINT_RESTORE=y
+
+    fd = open(...);
+    while (1) {
+        mmap(fd, ...);
+        munmap(fd, ...);
+    }
+
+  ls -la /proc/$PID/map_files
+
+Addresses https://bugzilla.kernel.org/show_bug.cgi?id=68991
+
+Signed-off-by: Artem Fetishev <artem_fetishev@epam.com>
+Signed-off-by: Aleksandr Terekhov <aleksandr_terekhov@epam.com>
+Reported-by: <wiebittewas@gmail.com>
+Acked-by: Pavel Emelyanov <xemul@parallels.com>
+Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
+Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.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>
+
+---
+ fs/proc/base.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -2092,6 +2092,7 @@ static int proc_map_files_get_link(struc
+       if (rc)
+               goto out_mmput;
+ 
++      rc = -ENOENT;
+       down_read(&mm->mmap_sem);
+       vma = find_exact_vma(mm, vm_start, vm_end);
+       if (vma && vma->vm_file) {

diff --git a/queue-3.4/series b/queue-3.4/series
index e083dab7c63d6cd43033b90da48b129ae062d7b2..f7b5237324e0cb99757a4f28a9bb05282ca8bb3a 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -21,3 +21,5 @@ firewire-net-fix-use-after-free.patch
 firewire-don-t-use-prepare_delayed_work.patch
 libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch
 nfs-fix-a-delegation-callback-race.patch
+fs-proc-base.c-fix-gpf-in-proc-pid-map_files.patch
+drm-radeon-atom-select-the-proper-number-of-lanes-in.patch