]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0131-objtool-Fix-cross-build.patch
KPTI: add follow-up fixes
[pve-kernel.git] / patches / kernel / 0131-objtool-Fix-cross-build.patch
1 From 2a83e03f3415c542956fac4f7c43ea75a44aba1d Mon Sep 17 00:00:00 2001
2 From: Josh Poimboeuf <jpoimboe@redhat.com>
3 Date: Tue, 7 Nov 2017 21:01:52 -0600
4 Subject: [PATCH 131/241] objtool: Fix cross-build
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 CVE-2017-5754
10
11 Stephen Rothwell reported this cross-compilation build failure:
12
13 | In file included from orc_dump.c:19:0:
14 | orc.h:21:10: fatal error: asm/orc_types.h: No such file or directory
15 | ...
16
17 Caused by:
18
19 6a77cff819ae ("objtool: Move synced files to their original relative locations")
20
21 Use the proper arch header files location, not the host-arch location.
22
23 Bisected-by: Stephen Rothwell <sfr@canb.auug.org.au>
24 Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
25 Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
26 Cc: Linus Torvalds <torvalds@linux-foundation.org>
27 Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>
28 Cc: Peter Zijlstra <peterz@infradead.org>
29 Cc: Thomas Gleixner <tglx@linutronix.de>
30 Link: http://lkml.kernel.org/r/20171108030152.bd76eahiwjwjt3kp@treble
31 Signed-off-by: Ingo Molnar <mingo@kernel.org>
32 (backported from commit 26bda786fb129698d96c9bc6d243f7a3cd3fc668)
33 Signed-off-by: Andy Whitcroft <apw@canonical.com>
34 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
35 (cherry picked from commit fbe7b2a70b2949ec3ba359c04fb60d8f31f74e04)
36 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
37 ---
38 tools/objtool/Makefile | 2 +-
39 1 file changed, 1 insertion(+), 1 deletion(-)
40
41 diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
42 index 90b0241f3ccc..847e99aa54ea 100644
43 --- a/tools/objtool/Makefile
44 +++ b/tools/objtool/Makefile
45 @@ -26,7 +26,7 @@ all: $(OBJTOOL)
46
47 INCLUDES := -I$(srctree)/tools/include \
48 -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
49 - -I$(srctree)/tools/objtool/arch/$(HOSTARCH)/include
50 + -I$(srctree)/tools/objtool/arch/$(ARCH)/include
51 CFLAGS += -Wall -Werror $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -fomit-frame-pointer -O2 -g $(INCLUDES)
52 LDFLAGS += -lelf $(LIBSUBCMD)
53
54 --
55 2.14.2
56