From b2aa09178d1132bc6731af609a079dde83feddc1 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 18 Jan 2020 09:25:45 +0100 Subject: [PATCH 1/4] MAINTAINERS: Mark simple firmware interface (SFI) obsolete Len Brown has not been active in this part since around 2010 and confirmed that he is not maintaining this part of the kernel sources anymore and the git log suggests that nobody is actively maintaining it. The referenced git tree does not exist. Instead, I found an sfi branch in Len's kernel git repository, but that has not been updated since 2014; so that is not worth to be mentioned in MAINTAINERS now anymore either. Len Brown expects no further systems to be shipped with SFI, so we can mark it obsolete and schedule it for deletion. This change was motivated after I found that I could not send any mails to the sfi-devel mailing list, and that the mailing list does not exist anymore. Signed-off-by: Lukas Bulwahn Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20200118082545.23464-1-lukas.bulwahn@gmail.com --- MAINTAINERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4017e6b760be..fe82a0deb8cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15044,11 +15044,8 @@ F: drivers/video/fbdev/sm712* F: Documentation/fb/sm712fb.rst SIMPLE FIRMWARE INTERFACE (SFI) -M: Len Brown -L: sfi-devel@simplefirmware.org W: http://simplefirmware.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git -S: Supported +S: Obsolete F: arch/x86/platform/sfi/ F: drivers/sfi/ F: include/linux/sfi*.h From 6ec14aa7a58a1c2fb303692f8cb1ff82d9abd10a Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Mon, 20 Jan 2020 12:14:07 -0600 Subject: [PATCH 2/4] objtool: Silence build output The sync-check.sh script prints out the path due to a "cd -" at the end of the script, even on silent builds. This isn't even needed, since the script is executed in our build instead of sourced (so it won't change the working directory of the surrounding build anyway). Just remove the cd to make the build silent. Fixes: 2ffd84ae973b ("objtool: Update sync-check.sh from perf's check-headers.sh") Signed-off-by: Olof Johansson Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/cb002857fafa8186cfb9c3e43fb62e4108a1bab9.1579543924.git.jpoimboe@redhat.com --- tools/objtool/sync-check.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh index 9bd04bbed01e..2a1261bfbb62 100755 --- a/tools/objtool/sync-check.sh +++ b/tools/objtool/sync-check.sh @@ -48,5 +48,3 @@ check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[ check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' - -cd - From 8580bed7e751e6d4f17881e059daf3cb37ba4717 Mon Sep 17 00:00:00 2001 From: Shile Zhang Date: Mon, 20 Jan 2020 12:14:08 -0600 Subject: [PATCH 3/4] objtool: Fix ARCH=x86_64 build error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building objtool with ARCH=x86_64 fails with: $make ARCH=x86_64 -C tools/objtool ... CC arch/x86/decode.o arch/x86/decode.c:10:22: fatal error: asm/insn.h: No such file or directory #include ^ compilation terminated. mv: cannot stat ‘arch/x86/.decode.o.tmp’: No such file or directory make[2]: *** [arch/x86/decode.o] Error 1 ... The root cause is that the command-line variable 'ARCH' cannot be overridden. It can be replaced by 'SRCARCH', which is defined in 'tools/scripts/Makefile.arch'. Signed-off-by: Shile Zhang Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Reviewed-by: Kamalesh Babulal Link: https://lore.kernel.org/r/d5d11370ae116df6c653493acd300ec3d7f5e925.1579543924.git.jpoimboe@redhat.com --- tools/objtool/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index d2a19b0bc05a..ee08aeff30a1 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -2,10 +2,6 @@ include ../scripts/Makefile.include include ../scripts/Makefile.arch -ifeq ($(ARCH),x86_64) -ARCH := x86 -endif - # always use the host compiler HOSTAR ?= ar HOSTCC ?= gcc @@ -33,7 +29,7 @@ all: $(OBJTOOL) INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ - -I$(srctree)/tools/arch/$(ARCH)/include + -I$(srctree)/tools/arch/$(SRCARCH)/include WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS) From 8728497895794d1f207a836e02dae762ad175d56 Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf Date: Mon, 20 Jan 2020 12:14:09 -0600 Subject: [PATCH 4/4] objtool: Skip samples subdirectory The code in the 'samples' subdirectory isn't part of the kernel, so there's no need to validate it. Reported-by: Randy Dunlap Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/c4cb4ef635ec606454ab834cb49fc3e9381fb1b1.1579543924.git.jpoimboe@redhat.com --- samples/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/Makefile b/samples/Makefile index 5ce50ef0f2b2..f8f847b4f61f 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for Linux samples code +OBJECT_FILES_NON_STANDARD := y obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs/ obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/