Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-05-14 21:46:52 +0200
committerMichal Suchanek <msuchanek@suse.de>2018-05-14 22:05:42 +0200
commit7c67409e3095a8d3067fba2afd71966d72c02e41 (patch)
tree392e2fea907a5f64970c93a3a8de8078da76fbce
parentc57839afde7bf21f34ba78fae4991232f4912ced (diff)
Re-add arm64 cpu hwcap padding.
Removed too eagerly with other kabi patches.
-rw-r--r--patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch b/patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
new file mode 100644
index 0000000000..1b6e1e3e03
--- /dev/null
+++ b/patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
@@ -0,0 +1,33 @@
+From ec9addc74beaf0632a29b0e0be8135c937ac15d7 Mon Sep 17 00:00:00 2001
+From: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+Date: Wed, 11 Apr 2018 14:02:08 +0200
+Subject: [PATCH] kabi: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys
+ arrays
+
+Patch-mainline: Never, applied to keep kabi preserved
+References: bsc#1089086
+
+Since cpu_hwcaps and cpu_hwcap_keys are exported symbols, reserve
+space in them for any future cpu capabilities or erratas.
+
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+---
+ arch/arm64/include/asm/cpucaps.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
+index ff89c3ad6d54..bca1c4395108 100644
+--- a/arch/arm64/include/asm/cpucaps.h
++++ b/arch/arm64/include/asm/cpucaps.h
+@@ -43,6 +43,7 @@
+ #define ARM64_HARDEN_BRANCH_PREDICTOR 22
+ #define ARM64_HARDEN_BP_POST_GUEST_EXIT 23
+
+-#define ARM64_NCAPS 24
++/* kabi: reserve 24 - 31 for future cpu capabilities */
++#define ARM64_NCAPS 32
+
+ #endif /* __ASM_CPUCAPS_H */
+--
+2.11.0
+
diff --git a/series.conf b/series.conf
index 34b18ea239..007b7d3cae 100644
--- a/series.conf
+++ b/series.conf
@@ -12429,6 +12429,7 @@
patches.suse/0001-Add-a-void-suse_kabi_padding-placeholder-to-some-USB.patch
patches.suse/0002-Add-a-void-suse_kabi_padding-placeholder-to-some-gsp.patch
patches.suse/0001-Thunderbolt-kABI-paddings-added.patch
+ patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
patches.suse/prepare-arm64-kgraft
########################################################