lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 545/846] x86/mce: Mark mce_read_aux() noinstr
    Date
    From: Borislav Petkov <bp@suse.de>

    [ Upstream commit db6c996d6ce45dfb44891f0824a65ecec216f47a ]

    Fixes

    vmlinux.o: warning: objtool: do_machine_check()+0x681: call to mce_read_aux() leaves .noinstr.text section

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lore.kernel.org/r/20211208111343.8130-10-bp@alien8.de
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/cpu/mce/core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
    index c37a0bcf2744b..e23e74e2f928d 100644
    --- a/arch/x86/kernel/cpu/mce/core.c
    +++ b/arch/x86/kernel/cpu/mce/core.c
    @@ -691,7 +691,7 @@ static struct notifier_block mce_default_nb = {
    /*
    * Read ADDR and MISC registers.
    */
    -static void mce_read_aux(struct mce *m, int i)
    +static noinstr void mce_read_aux(struct mce *m, int i)
    {
    if (m->status & MCI_STATUS_MISCV)
    m->misc = mce_rdmsrl(msr_ops.misc(i));
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 00:40    [W:2.367 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site