Skip to contentSkip to conversation

FAILED: patch "[PATCH] x86/vdso: Fix 'make bzImage' on older distros" failed to apply to 4.0-stable tree

PATCH [email protected] 2 participants 3 messages Jun 3, 2015 – Jun 19, 2015

Subsystems (2)
Stable branch x86
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From ef7254a595912b026d80a4116b8c4cd5b79d9c62 Mon Sep 17 00:00:00 2001

From: Oleg Nesterov <[email protected]>
Date: Mon, 11 May 2015 10:15:50 +0200
Subject: [PATCH] x86/vdso: Fix 'make bzImage' on older distros

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 <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Acked-by Andy Lutomirski <[email protected]>
Cc <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rusty Russell <[email protected]>
Cc Thomas Gleixner <[email protected]>
Fixes 6f121e548f83 ("x86, vdso: Reimplement vdso.so preparation in build-time C")
Link http://lkml.kernel.org/r/[email protected] open here
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
arch/x86/vdso/Makefile +1 -1
index 275a3a8b78af..e97032069f88 100644
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
 $(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  $@
#1 lore raw
Quoted 5 lines · On Tue, Jun 2, 2015 at 10:20 PM, <[email protected]> wrote:

The patch below does not apply to the 4.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

It should apply if 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda backported as well. Given that both are straightforward build fixes, they are probably reasonable to backport together.

--Andy

author maintainer
#2 lore raw
Quoted 10 lines · Andy Lutomirski
Quoted 5 lines · On Tue, Jun 2, 2015 at 10:20 PM, <[email protected]> wrote:

The patch below does not apply to the 4.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

It should apply if 0a4f59d6e09ef16fbb7d213cfa1bf472c7845fda backported as well. Given that both are straightforward build fixes, they are probably reasonable to backport together.

Thanks, that worked.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in