tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

- allow use of ARMv8 arch timer in 32-bit VDSO

- rename missed .fixup section

- fix kbuild issue with stack protector GCC plugin

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin
ARM: 8958/1: rename missed uaccess .fixup section
ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()

Linus Torvalds 3d135f52 fb33c651

+8 -4
unified split
+3 -1
arch/arm/Makefile
··· 307 307 ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y) 308 308 prepare: stack_protector_prepare 309 309 stack_protector_prepare: prepare0 310 - $(eval KBUILD_CFLAGS += \ 310 + $(eval SSP_PLUGIN_CFLAGS := \ 311 311 -fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell \ 312 312 awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\ 313 313 include/generated/asm-offsets.h) \ 314 314 -fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell \ 315 315 awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\ 316 316 include/generated/asm-offsets.h)) 317 + $(eval KBUILD_CFLAGS += $(SSP_PLUGIN_CFLAGS)) 318 + $(eval GCC_PLUGINS_CFLAGS += $(SSP_PLUGIN_CFLAGS)) 317 319 endif 318 320 319 321 all: $(notdir $(KBUILD_IMAGE))
+2 -2
arch/arm/boot/compressed/Makefile
··· 101 101 $(libfdt) $(libfdt_hdrs) hyp-stub.S 102 102 103 103 KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING 104 - KBUILD_CFLAGS += $(DISABLE_ARM_SSP_PER_TASK_PLUGIN) 105 104 106 105 ifeq ($(CONFIG_FUNCTION_TRACER),y) 107 106 ORIG_CFLAGS := $(KBUILD_CFLAGS) ··· 116 117 CFLAGS_fdt_rw.o := $(nossp-flags-y) 117 118 CFLAGS_fdt_wip.o := $(nossp-flags-y) 118 119 119 - ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj) 120 + ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \ 121 + -I$(obj) $(DISABLE_ARM_SSP_PER_TASK_PLUGIN) 120 122 asflags-y := -DZIMAGE 121 123 122 124 # Supply kernel BSS size to the decompressor via a linker symbol.
+2
arch/arm/kernel/vdso.c
··· 95 95 */ 96 96 np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer"); 97 97 if (!np) 98 + np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer"); 99 + if (!np) 98 100 goto out_put; 99 101 100 102 if (of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))
+1 -1
arch/arm/lib/copy_from_user.S
··· 118 118 119 119 ENDPROC(arm_copy_from_user) 120 120 121 - .pushsection .fixup,"ax" 121 + .pushsection .text.fixup,"ax" 122 122 .align 0 123 123 copy_abort_preamble 124 124 ldmfd sp!, {r1, r2, r3}