From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 19 Jun 2015 19:55:34 +0000 (-0700)
Subject: 4.0-stable patches
X-Git-Tag: v3.10.81~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38af665dfe482bfbc401833e590ff3bd19115e47;p=thirdparty%2Fkernel%2Fstable-queue.git

4.0-stable patches

added patches:
	x86-vdso-fix-make-bzimage-on-older-distros.patch
	x86-vdso-fix-the-x86-vdso2c-tool-includes.patch
---

diff --git a/queue-4.0/series b/queue-4.0/series
index 9556ce5f7fa..f36d27d79fb 100644
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -94,3 +94,5 @@ sched-numa-do-not-hint-for-numa-balancing-on-vm_mixedmap-mappings.patch
 blk-mq-free-hctx-ctxs-in-queue-s-release-handler.patch
 cfg80211-wext-clear-sinfo-struct-before-calling-driver.patch
 irqchip-sunxi-nmi-fix-off-by-one-error-in-irq-iterator.patch
+x86-vdso-fix-the-x86-vdso2c-tool-includes.patch
+x86-vdso-fix-make-bzimage-on-older-distros.patch
diff --git a/queue-4.0/x86-vdso-fix-make-bzimage-on-older-distros.patch b/queue-4.0/x86-vdso-fix-make-bzimage-on-older-distros.patch
new file mode 100644
index 00000000000..89799d04d09
--- /dev/null
+++ b/queue-4.0/x86-vdso-fix-make-bzimage-on-older-distros.patch
@@ -0,0 +1,50 @@
+From ef7254a595912b026d80a4116b8c4cd5b79d9c62 Mon Sep 17 00:00:00 2001
+From: Oleg Nesterov <oleg@redhat.com>
+Date: Mon, 11 May 2015 10:15:50 +0200
+Subject: x86/vdso: Fix 'make bzImage' on older distros
+
+From: Oleg Nesterov <oleg@redhat.com>
+
+commit ef7254a595912b026d80a4116b8c4cd5b79d9c62 upstream.
+
+Change HOST_EXTRACFLAGS to include arch/x86/include/uapi along
+with include/uapi.
+
+This looks more consistent, and this fixes "make bzImage" on my
+old distro which doesn't have asm/bitsperlong.h in /usr/include/.
+
+Signed-off-by: Oleg Nesterov <oleg@redhat.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Acked-by: Andy Lutomirski <luto@kernel.org>
+Cc: <stable@vger.kernel.org>
+Cc: Andy Lutomirski <luto@amacapital.net>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Brian Gerst <brgerst@gmail.com>
+Cc: Denys Vlasenko <dvlasenk@redhat.com>
+Cc: H. Peter Anvin <hpa@zytor.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Rusty Russell <rusty@rustcorp.com.au>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Fixes: 6f121e548f83 ("x86, vdso: Reimplement vdso.so preparation in build-time C")
+Link: http://lkml.kernel.org/r/1431332153-18566-6-git-send-email-bp@alien8.de
+Link: http://lkml.kernel.org/r/20150507165835.GB18652@redhat.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/vdso/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/vdso/Makefile
++++ b/arch/x86/vdso/Makefile
+@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname
+ $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+ 	$(call if_changed,vdso)
+ 
+-HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi
++HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
+ hostprogs-y			+= vdso2c
+ 
+ quiet_cmd_vdso2c = VDSO2C  $@
diff --git a/queue-4.0/x86-vdso-fix-the-x86-vdso2c-tool-includes.patch b/queue-4.0/x86-vdso-fix-the-x86-vdso2c-tool-includes.patch
new file mode 100644
index 00000000000..2f7bd903279
--- /dev/null
+++ b/queue-4.0/x86-vdso-fix-the-x86-vdso2c-tool-includes.patch
@@ -0,0 +1,39 @@
+From 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda Mon Sep 17 00:00:00 2001
+From: Tommi Kyntola <tommi.kyntola@gmail.com>
+Date: Fri, 27 Mar 2015 11:48:16 -0700
+Subject: x86/vdso: Fix the x86 vdso2c tool includes
+
+From: Tommi Kyntola <tommi.kyntola@gmail.com>
+
+commit 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda upstream.
+
+The build-time tool arch/x86/vdso/vdso2c.c includes <linux/elf.h>,
+but cannot find it, unless the build host happens to provide it.
+
+It should be reading the uapi linux/elf.h
+
+This build regression came along with the vdso2c changes between
+v3.15 and v3.16.
+
+Signed-off-by: Tommi Kyntola <tommi.kyntola@gmail.com>
+Signed-off-by: Andy Lutomirski <luto@amacapital.net>
+Link: http://lkml.kernel.org/r/1525002.3cJ7BySVpA@musta
+Link: http://lkml.kernel.org/r/efe1ec29eda830b1d0030882706f3dac99ce1f73.1427482099.git.luto@kernel.org
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/vdso/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/vdso/Makefile
++++ b/arch/x86/vdso/Makefile
+@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname
+ $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+ 	$(call if_changed,vdso)
+ 
+-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
++HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi
+ hostprogs-y			+= vdso2c
+ 
+ quiet_cmd_vdso2c = VDSO2C  $@