Commit 3d135f52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents fb33c651 89604523

arch/arm/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -307,13 +307,15 @@ endif 
ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)

prepare: stack_protector_prepare

stack_protector_prepare: prepare0

	$(eval KBUILD_CFLAGS += \

	$(eval SSP_PLUGIN_CFLAGS := \

		-fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell	\

			awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\

				include/generated/asm-offsets.h)	\

		-fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell	\

			awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\

				include/generated/asm-offsets.h))

	$(eval KBUILD_CFLAGS += $(SSP_PLUGIN_CFLAGS))

	$(eval GCC_PLUGINS_CFLAGS += $(SSP_PLUGIN_CFLAGS))

endif



all:	$(notdir $(KBUILD_IMAGE))

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \ 
		$(libfdt) $(libfdt_hdrs) hyp-stub.S



KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

KBUILD_CFLAGS += $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)
@@ -117,7 +116,8 @@ CFLAGS_fdt_ro.o := $(nossp-flags-y) 
CFLAGS_fdt_rw.o := $(nossp-flags-y)

CFLAGS_fdt_wip.o := $(nossp-flags-y)



ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj)

ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \

	     -I$(obj) $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)

asflags-y := -DZIMAGE



# Supply kernel BSS size to the decompressor via a linker symbol.

arch/arm/kernel/vdso.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ static bool __init cntvct_functional(void) 
	 * this.

	 */

	np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");

	if (!np)

		np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");

	if (!np)

		goto out_put;

arch/arm/lib/copy_from_user.S

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ ENTRY(arm_copy_from_user) 


ENDPROC(arm_copy_from_user)



	.pushsection .fixup,"ax"

	.pushsection .text.fixup,"ax"

	.align 0

	copy_abort_preamble

	ldmfd	sp!, {r1, r2, r3}

CRA Git | Maintained and supported by SUSTech CRA and CCSE