@@ -12,8 +12,8 @@ config ARM_32
config ARM_64
def_bool y
depends on 64BIT
+ select HAS_ALTERNATIVE
select HAS_GICV3
- select ALTERNATIVE
config ARM
def_bool y
@@ -45,13 +45,13 @@ config ACPI
config HAS_GICV3
bool
-config ALTERNATIVE
+config HAS_ALTERNATIVE
bool
endmenu
menu "ARM errata workaround via the alternative framework"
- depends on ALTERNATIVE
+ depends on HAS_ALTERNATIVE
config ARM64_ERRATUM_827319
bool "Cortex-A53: 827319: Data cache clean instructions might cause overlapping transactions to the interconnect"
@@ -4,7 +4,7 @@ subdir-y += platforms
subdir-$(CONFIG_ARM_64) += efi
subdir-$(CONFIG_ACPI) += acpi
-obj-$(CONFIG_ALTERNATIVE) += alternative.o
+obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o
obj-y += bootfdt.o
obj-y += cpu.o
obj-y += cpuerrata.o
@@ -151,7 +151,7 @@ SECTIONS
*(.initcall1.init)
__initcall_end = .;
-#ifdef CONFIG_ALTERNATIVE
+#ifdef CONFIG_HAS_ALTERNATIVE
. = ALIGN(4);
__alt_instructions = .;
*(.altinstructions)
@@ -5,7 +5,7 @@
#include <xen/config.h>
#include <xen/kconfig.h>
-#ifdef CONFIG_ALTERNATIVE
+#ifdef CONFIG_HAS_ALTERNATIVE
#ifndef __ASSEMBLY__
@@ -154,7 +154,7 @@ int apply_alternatives(const struct alt_instr *start, const struct alt_instr *en
#define ALTERNATIVE(oldinstr, newinstr, ...) \
_ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1)
-#else /* !CONFIG_ALTERNATIVE */
+#else /* !CONFIG_HAS_ALTERNATIVE */
static inline void apply_alternatives_all(void)
{
@@ -7,7 +7,7 @@
void check_local_cpu_errata(void);
-#ifdef CONFIG_ALTERNATIVE
+#ifdef CONFIG_HAS_ALTERNATIVE
#define CHECK_WORKAROUND_HELPER(erratum, feature, arch) \
static inline bool_t check_workaround_##erratum(void) \
@@ -27,7 +27,7 @@ static inline bool_t check_workaround_##erratum(void) \
} \
}
-#else /* CONFIG_ALTERNATIVE */
+#else /* CONFIG_HAS_ALTERNATIVE */
#define CHECK_WORKAROUND_HELPER(erratum, feature, arch) \
static inline bool_t check_workaround_##erratum(void) \
No functional change. We resist the temptation to move the entries in the Kconfig file to be more in alphabetical order as the "arm/x86/common: Add HAS_[ALTERNATIVE|EX_TABLE]" will move one of the entries to common file. Suggested-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- Cc: Julien Grall <julien.grall@arm.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Doug Goldstein <cardoe@cardoe.com> v4: New submission. [Forgot to post as part of the patch series, included as inline reply to one of the patches]. v5: Don't sort the HAS_ALTERNATIVE and HAS_GICV3 in alphabetical order. --- xen/arch/arm/Kconfig | 6 +++--- xen/arch/arm/Makefile | 2 +- xen/arch/arm/xen.lds.S | 2 +- xen/include/asm-arm/alternative.h | 4 ++-- xen/include/asm-arm/cpuerrata.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)