diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:01:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:01:35 -0400 |
| commit | f739992805560c8ff59d89aca9287ba0b9df3e4c (patch) | |
| tree | 13a6c83997e44e2757b56114c8a2874b768f7452 | |
| parent | edbedf66accdbb260e8d0861be93829cc0cf0ca9 (diff) | |
| download | longterm-queue-4.12-f739992805560c8ff59d89aca9287ba0b9df3e4c.tar.gz | |
arm64: makefile refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-ssbd-Add-prctl-interface-for-per-thread-mitiga.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/arm64-ssbd-Add-prctl-interface-for-per-thread-mitiga.patch b/queue/arm64-ssbd-Add-prctl-interface-for-per-thread-mitiga.patch index fbf6d39..ffc28a1 100644 --- a/queue/arm64-ssbd-Add-prctl-interface-for-per-thread-mitiga.patch +++ b/queue/arm64-ssbd-Add-prctl-interface-for-per-thread-mitiga.patch @@ -1,4 +1,4 @@ -From 9cdc0108baa8ef87c76ed834619886a46bd70cbe Mon Sep 17 00:00:00 2001 +From 2f15a648f738bd1043c630566d9b70d4e9d777e6 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Tue, 29 May 2018 13:11:14 +0100 Subject: [PATCH] arm64: ssbd: Add prctl interface for per-thread mitigation @@ -13,15 +13,16 @@ will for this particular thread. Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile -index bf825f38d206..0025f8691046 100644 +index 947b8a5fa874..7b195e273dd4 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile -@@ -54,6 +54,7 @@ arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o - arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o - arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o - arm64-obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o +@@ -57,6 +57,7 @@ arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o + ifeq ($(CONFIG_KVM),y) + arm64-obj-$(CONFIG_HARDEN_BRANCH_PREDICTOR) += bpi.o + endif +arm64-obj-$(CONFIG_ARM64_SSBD) += ssbd.o obj-y += $(arm64-obj-y) vdso/ probes/ |