4.4-stable patches

added patches:
	arm-8457-1-psci-smp-is-built-only-for-smp.patch
	drm-gma500-use-correct-unref-in-the-gem-bo-create-function.patch

diff --git a/queue-4.4/arm-8457-1-psci-smp-is-built-only-for-smp.patch b/queue-4.4/arm-8457-1-psci-smp-is-built-only-for-smp.patch
new file mode 100644 (file)
index 0000000..95acefb
--- /dev/null
+++ b/queue-4.4/arm-8457-1-psci-smp-is-built-only-for-smp.patch
@@ -0,0 +1,39 @@
+From be95485a0b8288a93402705730d3ea32f9f812b9 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 19 Nov 2015 15:03:57 +0100
+Subject: ARM: 8457/1: psci-smp is built only for SMP
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit be95485a0b8288a93402705730d3ea32f9f812b9 upstream.
+
+The PSCI SMP implementation is built only when both CONFIG_SMP and
+CONFIG_ARM_PSCI are set, so a configuration that has the latter
+but not the former can get a link error when it tries to call
+psci_smp_available().
+
+arch/arm/mach-tegra/built-in.o: In function `tegra114_cpuidle_init':
+cpuidle-tegra114.c:(.init.text+0x52a): undefined reference to `psci_smp_available'
+
+This corrects the #ifdef in the psci.h header file to match the
+Makefile conditional we have for building that function.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/include/asm/psci.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/include/asm/psci.h
++++ b/arch/arm/include/asm/psci.h
+@@ -16,7 +16,7 @@
+ 
+ extern struct smp_operations psci_smp_ops;
+ 
+-#ifdef CONFIG_ARM_PSCI
++#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI)
+ bool psci_smp_available(void);
+ #else
+ static inline bool psci_smp_available(void) { return false; }

diff --git a/queue-4.4/drm-gma500-use-correct-unref-in-the-gem-bo-create-function.patch b/queue-4.4/drm-gma500-use-correct-unref-in-the-gem-bo-create-function.patch
new file mode 100644 (file)
index 0000000..2a66590
--- /dev/null
+++ b/queue-4.4/drm-gma500-use-correct-unref-in-the-gem-bo-create-function.patch
@@ -0,0 +1,36 @@
+From d3e376f52d095103ca51dbda4d6ff8aaf488f98f Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Mon, 23 Nov 2015 10:32:49 +0100
+Subject: drm/gma500: Use correct unref in the gem bo create function
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit d3e376f52d095103ca51dbda4d6ff8aaf488f98f upstream.
+
+This is called without dev->struct_mutex held, we need to use the
+_unlocked variant.
+
+Never caught in the wild since you'd need an evil userspace which
+races a gem_close ioctl call with the in-progress open.
+
+Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: http://patchwork.freedesktop.org/patch/msgid/1448271183-20523-17-git-send-email-daniel.vetter@ffwll.ch
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/gma500/gem.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/gma500/gem.c
++++ b/drivers/gpu/drm/gma500/gem.c
+@@ -130,7 +130,7 @@ int psb_gem_create(struct drm_file *file
+               return ret;
+       }
+       /* We have the initial and handle reference but need only one now */
+-      drm_gem_object_unreference(&r->gem);
++      drm_gem_object_unreference_unlocked(&r->gem);
+       *handlep = handle;
+       return 0;
+ }

diff --git a/queue-4.4/series b/queue-4.4/series
index 9fb37e936adab98f2d1c4fb2dc107f2ad0666f90..44dff22a2d4308eb4f09c7fdffad5abb6f38d983 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -50,3 +50,5 @@ arm-debug-ll-fix-bcm63xx-entry-for-multiplatform.patch
 arm64-errata-add-mpc-relative-literal-loads-to-build-flags.patch
 kvm-s390-fix-guest-fprs-memory-leak.patch
 devm_memremap-fix-error-value-when-memremap-failed.patch
+drm-gma500-use-correct-unref-in-the-gem-bo-create-function.patch
+arm-8457-1-psci-smp-is-built-only-for-smp.patch