diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 11:03:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 11:03:21 -0800 |
| commit | 80b60e3849bfe987801a73ebd4bab43b7b591a09 (patch) | |
| tree | 54a3e6ad4f960ddaa2c3eda7deba1c518d6a6fdb | |
| parent | Merge tag 'char-misc-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (diff) | |
| parent | Merge branch 'core/documentation' into core/urgent, to pick up single commit (diff) | |
| download | linux-dev-80b60e3849bfe987801a73ebd4bab43b7b591a09.tar.xz linux-dev-80b60e3849bfe987801a73ebd4bab43b7b591a09.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"Three objtool fixes, plus marking SFI as obsolete"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Skip samples subdirectory
objtool: Fix ARCH=x86_64 build error
objtool: Silence build output
MAINTAINERS: Mark simple firmware interface (SFI) obsolete
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | samples/Makefile | 1 | ||||
| -rw-r--r-- | tools/objtool/Makefile | 6 | ||||
| -rwxr-xr-x | tools/objtool/sync-check.sh | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eb2ea59932b9..d9d7f71c5ce3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15177,11 +15177,8 @@ F: drivers/video/fbdev/sm712* F: Documentation/fb/sm712fb.rst SIMPLE FIRMWARE INTERFACE (SFI) -M: Len Brown <lenb@kernel.org> -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 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/ 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) 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 - |