From 570a470112db11aa816f279f459b0d43877d4189 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 14 Jul 2020 10:34:51 +0200 Subject: [PATCH] Revert merge resolution artefacts from 5.8-rc merges Mostly leftovers from taking out the LTO patches. Fixes: v5.8-rc merges Cc: Greg Kroah-Hartman Signed-off-by: Matthias Maennich Change-Id: I81fe6da94a4bb29615ef5e35104f01fd8e4c8c17 --- arch/Kconfig | 1 - arch/arm64/kernel/vdso/Makefile | 4 +--- drivers/usb/host/Makefile | 1 - mm/page_alloc.c | 1 - scripts/Makefile | 2 -- scripts/Makefile.build | 14 -------------- scripts/link-vmlinux.sh | 1 - scripts/module-lto.lds.S | 34 --------------------------------- 8 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 scripts/module-lto.lds.S diff --git a/arch/Kconfig b/arch/Kconfig index 661310ff3685..7c64ea7b936a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -552,7 +552,6 @@ config SHADOW_CALL_STACK reading and writing arbitrary memory may be able to locate them and hijack control flow by modifying the stacks. - config CFI_CLANG bool "Use Clang's Control Flow Integrity (CFI)" depends on LTO_CLANG && KALLSYMS diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index e05205191fc2..45d5cfe46429 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -30,9 +30,7 @@ ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv \ ccflags-y := -fno-common -fno-builtin -fno-stack-protector -ffixed-x18 ccflags-y += -DDISABLE_BRANCH_PROFILING -CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) $(GCC_PLUGINS_CFLAGS) \ - $(CC_FLAGS_LTO) - +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os $(CC_FLAGS_SCS) $(GCC_PLUGINS_CFLAGS) KBUILD_CFLAGS += $(DISABLE_LTO) KASAN_SANITIZE := n UBSAN_SANITIZE := n diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index a4ad6258273a..bc731332fed9 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -71,7 +71,6 @@ obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o -obj-$(CONFIG_USB_XHCI_PCI_RENESAS) += xhci-pci-renesas.o obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o obj-$(CONFIG_USB_XHCI_PCI_RENESAS) += xhci-pci-renesas.o obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 27b85fc48912..db79c046f884 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7819,7 +7819,6 @@ static void __setup_per_zone_wmarks(void) zone->watermark_boost = 0; zone->_watermark[WMARK_LOW] = min_wmark_pages(zone) + low + tmp; zone->_watermark[WMARK_HIGH] = min_wmark_pages(zone) + low + tmp * 2; - zone->watermark_boost = 0; spin_unlock_irqrestore(&zone->lock, flags); } diff --git a/scripts/Makefile b/scripts/Makefile index 0d3211aa94db..95ecf970c74c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -31,8 +31,6 @@ hostprogs := $(always-y) $(always-m) # The following programs are only built on demand hostprogs += unifdef -extra-$(CONFIG_LTO_CLANG) += module-lto.lds - subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux diff --git a/scripts/Makefile.build b/scripts/Makefile.build index c7621f751309..2e8810b7e5ed 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -389,20 +389,6 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler $(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ; $(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ; -# combine symversions for later processing -quiet_cmd_update_lto_symversions = SYMVER $@ -ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) - cmd_update_lto_symversions = \ - rm -f $@.symversions; \ - for i in $(foreach n, \ - $(filter-out FORCE,$^), \ - $(if $(wildcard $(n).symversions),$(n))); do \ - cat $$i.symversions >> $@.symversions; \ - done -else - cmd_update_lto_symversions = echo >/dev/null -endif - # # Rule to compile a set of .o files into one .a file (without symbol table) # diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index e307c47f12f1..92dd745906f4 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -221,7 +221,6 @@ cleanup() { rm -f .btf.* rm -f .tmp_System.map - rm -f .tmp_kallsyms* rm -f .tmp_vmlinux* rm -f System.map rm -f vmlinux diff --git a/scripts/module-lto.lds.S b/scripts/module-lto.lds.S deleted file mode 100644 index c0f4fdeb84a0..000000000000 --- a/scripts/module-lto.lds.S +++ /dev/null @@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include - -/* - * With CONFIG_LTO_CLANG, LLD always enables -fdata-sections and - * -ffunction-sections, which increases the size of the final module. - * Merge the split sections in the final binary. - */ -SECTIONS { - /* - * LLVM may emit .eh_frame with CONFIG_CFI_CLANG despite - * -fno-asynchronous-unwind-tables. Discard the section. - */ - /DISCARD/ : { - *(.eh_frame) - } - - .bss : { *(.bss .bss.[0-9a-zA-Z_]*) } - .data : { *(.data .data.[0-9a-zA-Z_]*) } - .rela.data : { *(.rela.data .rela.data.[0-9a-zA-Z_]*) } - .rela.rodata : { *(.rela.rodata .rela.rodata.[0-9a-zA-Z_]*) } - .rela.text : { *(.rela.text .rela.text.[0-9a-zA-Z_]*) } - .rodata : { *(.rodata .rodata.[0-9a-zA-Z_]*) } - - /* - * With CFI_CLANG, ensure __cfi_check is at the beginning of the - * .text section, and that the section is aligned to page size. - */ - .text : ALIGN(PAGE_SIZE) { - *(.text.__cfi_check) - *(.text .text.[0-9a-zA-Z_]* .text..L.cfi*) - } - -}