From 43c187851f2a7a1f370305b5f347aa12442ed69c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Feb 2016 21:24:55 -0800 Subject: [PATCH] 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 --- ...457-1-psci-smp-is-built-only-for-smp.patch | 39 +++++++++++++++++++ ...-unref-in-the-gem-bo-create-function.patch | 36 +++++++++++++++++ queue-4.4/series | 2 + 3 files changed, 77 insertions(+) create mode 100644 queue-4.4/arm-8457-1-psci-smp-is-built-only-for-smp.patch create mode 100644 queue-4.4/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 index 00000000000..95acefb4693 --- /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 +Date: Thu, 19 Nov 2015 15:03:57 +0100 +Subject: ARM: 8457/1: psci-smp is built only for SMP + +From: Arnd Bergmann + +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 +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..2a665903999 --- /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 +Date: Mon, 23 Nov 2015 10:32:49 +0100 +Subject: drm/gma500: Use correct unref in the gem bo create function + +From: Daniel Vetter + +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 +Acked-by: Patrik Jakobsson +Signed-off-by: Daniel Vetter +Link: http://patchwork.freedesktop.org/patch/msgid/1448271183-20523-17-git-send-email-daniel.vetter@ffwll.ch +Signed-off-by: Greg Kroah-Hartman + +--- + 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 9fb37e936ad..44dff22a2d4 100644 --- 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 -- 2.47.3