public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, jkosina@suse.cz, tglx@linutronix.de,
	stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] cpu/SMT: Fix x86 link error without CONFIG_SYSFS" failed to apply to 4.19-stable tree
Date: Sun, 19 Jan 2020 11:36:35 -0500	[thread overview]
Message-ID: <20200119163635.GU1706@sasha-vm> (raw)
In-Reply-To: <1579444808186154@kroah.com>

On Sun, Jan 19, 2020 at 03:40:08PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From dc8d37ed304eeeea47e65fb9edc1c6c8b0093386 Mon Sep 17 00:00:00 2001
>From: Arnd Bergmann <arnd@arndb.de>
>Date: Tue, 10 Dec 2019 20:56:04 +0100
>Subject: [PATCH] cpu/SMT: Fix x86 link error without CONFIG_SYSFS
>
>When CONFIG_SYSFS is disabled, but CONFIG_HOTPLUG_SMT is enabled,
>the kernel fails to link:
>
>arch/x86/power/cpu.o: In function `hibernate_resume_nonboot_cpu_disable':
>(.text+0x38d): undefined reference to `cpuhp_smt_enable'
>arch/x86/power/hibernate.o: In function `arch_resume_nosmt':
>hibernate.c:(.text+0x291): undefined reference to `cpuhp_smt_enable'
>hibernate.c:(.text+0x29c): undefined reference to `cpuhp_smt_disable'
>
>Move the exported functions out of the #ifdef section into its
>own with the correct conditions.
>
>The patch that caused this is marked for stable backports, so
>this one may need to be backported as well.
>
>Fixes: ec527c318036 ("x86/power: Fix 'nosmt' vs hibernation triple fault during resume")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>Reviewed-by: Jiri Kosina <jkosina@suse.cz>
>Cc: stable@vger.kernel.org
>Link: https://lore.kernel.org/r/20191210195614.786555-1-arnd@arndb.de

I'm not actually seeing this failure on 4.19 and older, so I won't try
and figure this out.

$ grep 'CONFIG_HOTPLUG_SMT\|CONFIG_SYSFS' .config
# CONFIG_SYSFS_SYSCALL is not set
CONFIG_HOTPLUG_SMT=y
# CONFIG_SYSFS is not set
$ make -j
[...]
Kernel: arch/x86/boot/bzImage is ready  (#1)

-- 
Thanks,
Sasha

      reply	other threads:[~2020-01-19 16:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-19 14:40 FAILED: patch "[PATCH] cpu/SMT: Fix x86 link error without CONFIG_SYSFS" failed to apply to 4.19-stable tree gregkh
2020-01-19 16:36 ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200119163635.GU1706@sasha-vm \
    --to=sashal@kernel.org \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=jkosina@suse.cz \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox