From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 6 Feb 2018 10:27:08 +0000 (-0800)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.94~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57caf10a868192eef5df3327ef69be762067e766;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	um-fix-out-of-tree-build.patch
---

diff --git a/queue-3.18/series b/queue-3.18/series
index 2ba2cf3b494..43f1a71d94f 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -34,3 +34,4 @@ usb-uas-unconditionally-bring-back-host-after-reset.patch
 selinux-general-protection-fault-in-sock_has_perm.patch
 spi-imx-do-not-access-registers-while-clocks-disabled.patch
 asoc-pcm512x-add-missing-module_description-author-license.patch
+um-fix-out-of-tree-build.patch
diff --git a/queue-3.18/um-fix-out-of-tree-build.patch b/queue-3.18/um-fix-out-of-tree-build.patch
new file mode 100644
index 00000000000..cc344490f64
--- /dev/null
+++ b/queue-3.18/um-fix-out-of-tree-build.patch
@@ -0,0 +1,37 @@
+From 0b5aedfe0e6654ec54f35109e1929a1cf7fc4cdd Mon Sep 17 00:00:00 2001
+From: Richard Weinberger <richard@nod.at>
+Date: Sun, 28 Jun 2015 22:55:26 +0200
+Subject: um: Fix out-of-tree build
+
+From: Richard Weinberger <richard@nod.at>
+
+commit 0b5aedfe0e6654ec54f35109e1929a1cf7fc4cdd upstream.
+
+Commit 30b11ee9a (um: Remove copy&paste code from init.h)
+uncovered an issue wrt. out-of-tree builds.
+For out-of-tree builds, we must not rely on relative paths.
+Before 30b11ee9a it worked by chance as no host code included
+generated header files.
+
+Acked-by: Randy Dunlap <rdunlap@infradead.org>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/um/Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/um/Makefile
++++ b/arch/um/Makefile
+@@ -70,8 +70,8 @@ KBUILD_AFLAGS += $(ARCH_INCLUDE)
+ 
+ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
+ 		$(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \
+-		-D_FILE_OFFSET_BITS=64 -idirafter include \
+-		-D__KERNEL__ -D__UM_HOST__
++		-D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \
++		-idirafter $(obj)/include -D__KERNEL__ -D__UM_HOST__
+ 
+ #This will adjust *FLAGS accordingly to the platform.
+ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)