lkml.org 
[lkml]   [2018]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 56/64] x86/pti: Mark constant arrays as __initconst
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann arnd@arndb.de

    commit 4bf5d56d429cbc96c23d809a08f63cd29e1a702e

    I'm seeing build failures from the two newly introduced arrays that
    are marked 'const' and '__initdata', which are mutually exclusive:

    arch/x86/kernel/cpu/common.c:882:43: error: 'cpu_no_speculation' causes a section type conflict with 'e820_table_firmware_init'
    arch/x86/kernel/cpu/common.c:895:43: error: 'cpu_no_meltdown' causes a section type conflict with 'e820_table_firmware_init'

    The correct annotation is __initconst.

    Fixes: fec9434a12f3 ("x86/pti: Do not enable PTI on CPUs which are not vulnerable to Meltdown")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Thomas Garnier <thgarnie@google.com>
    Cc: David Woodhouse <dwmw@amazon.co.uk>
    Link: https://lkml.kernel.org/r/20180202213959.611210-1-arnd@arndb.de
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


    ---
    arch/x86/kernel/cpu/common.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -876,7 +876,7 @@ static void identify_cpu_without_cpuid(s
    #endif
    }

    -static const __initdata struct x86_cpu_id cpu_no_speculation[] = {
    +static const __initconst struct x86_cpu_id cpu_no_speculation[] = {
    { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_CEDARVIEW, X86_FEATURE_ANY },
    { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_CLOVERVIEW, X86_FEATURE_ANY },
    { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_LINCROFT, X86_FEATURE_ANY },
    @@ -889,7 +889,7 @@ static const __initdata struct x86_cpu_i
    {}
    };

    -static const __initdata struct x86_cpu_id cpu_no_meltdown[] = {
    +static const __initconst struct x86_cpu_id cpu_no_meltdown[] = {
    { X86_VENDOR_AMD },
    {}
    };

    \
     
     \ /
      Last update: 2018-02-05 19:36    [W:4.142 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site