From: David Hildenbrand <da...@redhat.com> [ Upstream commit cec1680591d6d5b10ecc10f370210089416e98af ]
device_online() should be called with device_hotplug_lock() held. Link: http://lkml.kernel.org/r/20180925091457.28651-5-da...@redhat.com Signed-off-by: David Hildenbrand <da...@redhat.com> Reviewed-by: Pavel Tatashin <pavel.tatas...@microsoft.com> Reviewed-by: Rashmica Gupta <rashmic...@gmail.com> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Paul Mackerras <pau...@samba.org> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Rashmica Gupta <rashmic...@gmail.com> Cc: Balbir Singh <bsinghar...@gmail.com> Cc: Michael Neuling <mi...@neuling.org> Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> Cc: Dan Williams <dan.j.willi...@intel.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Haiyang Zhang <haiya...@microsoft.com> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: John Allen <jal...@linux.vnet.ibm.com> Cc: Jonathan Corbet <cor...@lwn.net> Cc: Joonsoo Kim <iamjoonsoo....@lge.com> Cc: Juergen Gross <jgr...@suse.com> Cc: Kate Stewart <kstew...@linuxfoundation.org> Cc: "K. Y. Srinivasan" <k...@microsoft.com> Cc: Len Brown <l...@kernel.org> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Mathieu Malaterre <ma...@debian.org> Cc: Michal Hocko <mho...@suse.com> Cc: Nathan Fontenot <nf...@linux.vnet.ibm.com> Cc: Oscar Salvador <osalva...@suse.de> Cc: Philippe Ombredanne <pombreda...@nexb.com> Cc: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net> Cc: Stephen Hemminger <sthem...@microsoft.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Vlastimil Babka <vba...@suse.cz> Cc: YASUAKI ISHIMATSU <yasu.isim...@gmail.com> Signed-off-by: Andrew Morton <a...@linux-foundation.org> Signed-off-by: Linus Torvalds <torva...@linux-foundation.org> Signed-off-by: Sasha Levin <sas...@kernel.org> --- arch/powerpc/platforms/powernv/memtrace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c index 232bf5987f91d..dd3cc4632b9ae 100644 --- a/arch/powerpc/platforms/powernv/memtrace.c +++ b/arch/powerpc/platforms/powernv/memtrace.c @@ -244,9 +244,11 @@ static int memtrace_online(void) * we need to online the memory ourselves. */ if (!memhp_auto_online) { + lock_device_hotplug(); walk_memory_range(PFN_DOWN(ent->start), PFN_UP(ent->start + ent->size - 1), NULL, online_mem_block); + unlock_device_hotplug(); } /* -- 2.20.1
