[Xen-changelog] [xen master] arm/x86/common: Add HAS_[ALTERNATIVE|EX_TABLE]

[patchbot@xxxxxxx]

commit 44db782fd20edae12d9292e0e72450ae46f6a739
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Mon Sep 19 11:12:51 2016 -0400
Commit:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
CommitDate: Fri Sep 23 12:39:44 2016 -0400

    arm/x86/common: Add HAS_[ALTERNATIVE|EX_TABLE]
    
    x86 implements all of them by default - and we just
    add two extra HAS_ variables to be declared in autoconf.h.
    
    ARM 64 only has alternative while ARM 32 has none of them.
    
    And while at it change the livepatch common code that
    would benefit from this.
    
    Reviewed-by: Julien Grall <julien.grall@xxxxxxx>
    Reviewed-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx> [relevant parts]
    Suggested-by: Julien Grall <julien.grall@xxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 xen/arch/arm/Kconfig   | 3 ---
 xen/arch/x86/Kconfig   | 2 ++
 xen/common/Kconfig     | 6 ++++++
 xen/common/livepatch.c | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 558d013..2e023d1 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -45,9 +45,6 @@ config ACPI
 config HAS_GICV3
        bool
 
-config HAS_ALTERNATIVE
-       bool
-
 endmenu
 
 menu "ARM errata workaround via the alternative framework"
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 265fd79..96ca2bf 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -7,8 +7,10 @@ config X86
        select ACPI_LEGACY_TABLES_LOOKUP
        select COMPAT
        select CORE_PARKING
+       select HAS_ALTERNATIVE
        select HAS_CPUFREQ
        select HAS_EHCI
+       select HAS_EX_TABLE
        select HAS_GDBSX
        select HAS_IOPORTS
        select HAS_KEXEC
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 4331874..81e0017 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -11,9 +11,15 @@ config COMPAT
 config CORE_PARKING
        bool
 
+config HAS_ALTERNATIVE
+       bool
+
 config HAS_DEVICE_TREE
        bool
 
+config HAS_EX_TABLE
+       bool
+
 config HAS_MEM_ACCESS
        bool
 
diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c
index 0ca4804..e14ded6 100644
--- a/xen/common/livepatch.c
+++ b/xen/common/livepatch.c
@@ -641,7 +641,7 @@ static int prepare_payload(struct payload *payload,
                                   sizeof(*region->frame[i].bugs);
     }
 
-#ifndef CONFIG_ARM
+#ifdef CONFIG_HAS_ALTERNATIVE
     sec = livepatch_elf_sec_by_name(elf, ".altinstructions");
     if ( sec )
     {
@@ -672,7 +672,9 @@ static int prepare_payload(struct payload *payload,
         }
         apply_alternatives(start, end);
     }
+#endif
 
+#ifdef CONFIG_HAS_EX_TABLE
     sec = livepatch_elf_sec_by_name(elf, ".ex_table");
     if ( sec )
     {
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog