From patchwork Mon Jul 3 04:01:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 106871 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5303753qge; Sun, 2 Jul 2017 21:02:05 -0700 (PDT) X-Received: by 10.99.121.77 with SMTP id u74mr8143360pgc.107.1499054525047; Sun, 02 Jul 2017 21:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499054525; cv=none; d=google.com; s=arc-20160816; b=Sn1qPoxoiyFG2yr28mp58QaIIPHIABjeCsgM36kawG/Ncnb8Bxqd054pqi63/k4SM3 ER90lzJpSjELX0XjG2CPeEZOkLLY4L5G2RmyM/IIx1iRj6pVAwnymnNn8XbXXjfDYYqK UoX6UPYLO9HOx3zyEXqx6jwFSM3PU+KLPwapG5xAfLEK4Rq01dETX52rWvG81h6nsgVq 7rN0PcP5PrFCFIyvdgq2SeGzfolfufY4qSc8XHZH3eQSSoQXd5Td5Nc3TXhSrEav+eND BVFkL5zMUWnF9fKF+a7fCT2A0UdxRNN+b+4tgHlH2QCbIzQ+LGw3Hc28PrZsWWIN+qhC HXaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=cuHs9/ErTVcmBek7VxlxFau4tusiaCbsC9nLUjO/azY=; b=0/6Yttyp046TvMjdL+r83x4tGsEGevQ6d4Ou+KPHfiZHfDI10ZW2zcqPVFzJ7q/o56 NPPEL6vwDAYBNLE/weH7qyvEAXmBYgNLUBcpEg7qePALO7KzWUg9ZQeB3sj3f4dD3b3N 31P4nsrdTjHbMJgfjJ7cj7RgHNAbcswr0SDKictFao/82aAbYetKJ3r6ua2sPVCJCizO vRv2AT/fx8YjDsBgYMU+M8ADc02r8X5PyNgGcIz+RDZB5RJO7K9fkrjeNOYJUoY7aT7G YUTtW7u5Dc/JGRifLOXosNZVSxi1BEg+zZfk+aCy2PUHh3hHC0PnEDcEABcWx1cjRrL7 ajAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.b=mUpcZH/0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x74si11305036pfe.463.2017.07.02.21.02.04; Sun, 02 Jul 2017 21:02:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.b=mUpcZH/0; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750728AbdGCECE (ORCPT + 6 others); Mon, 3 Jul 2017 00:02:04 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35694 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727AbdGCECD (ORCPT ); Mon, 3 Jul 2017 00:02:03 -0400 Received: by mail-pf0-f193.google.com with SMTP id s66so24258956pfs.2; Sun, 02 Jul 2017 21:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cuHs9/ErTVcmBek7VxlxFau4tusiaCbsC9nLUjO/azY=; b=mUpcZH/0ndsYkAPTgAegCKI92cIahWCHWQTOCIqqYHSssSAMX13leAD5ySIPMlUaJo sTqBV4rUHOxOf5u8lzzQ2Ld/3aRWOmUiRXln9CQgDo/3Nyd7gw2w55cij9iw+tBQ+im9 zfyu8nY6GqozieUfrTiBLZIscNwiz9kV2FnQQLeM0SPHkhVzOMNcTKeRYvxCBs1co54q 8zbS14toGqEZzGUTOHxYrLjsTjM+S+h5vsuGUanyob5J+l21plwy0eQ23KahWFYjkjbb 6fS5PAC/cQmMebd4bWc2sQvNyqvdvMhIp7eHgJPHUgK+SZJP/PF92L/o7QC4ptFZOX+V KqjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=cuHs9/ErTVcmBek7VxlxFau4tusiaCbsC9nLUjO/azY=; b=m9opfOcGThz0eV2oBhPXTw9Md5Pmt3UoSZiYWHWFWzXh/yLkXsfjfsw4zSq2W89oGY UKO0NiBbli7ej8b7KlXzYCtdd170EJmScEJmYt0BgZ+f+W7uIrhz8hvTExcezlICNgQz 1NCbrdhj6qPsv57Fx6UCOx9uh6w3yfeNXVn9+a/EkWPXwwWnzdliw0uedhUypO+SDFHo /lht9AIg/nhPcMXi25oyPKV7KfdhNpd+48INMfB66HftXo0HS9j5ilaule2VvXGniTml HT3xRpLNzDQWAv+4Or8vjn4hRtRt5QtwC9mRLe9i5w5VXz9wKR5uLqan7hoOlwk3tl9/ rnAQ== X-Gm-Message-State: AIVw113jVtAK41Ygk+aQY+X079B5mBqE5LZkq0PBndaZS7u8w5GSn2Q6 JQt3H2k+4huVCQ== X-Received: by 10.84.216.13 with SMTP id m13mr8373509pli.201.1499054522266; Sun, 02 Jul 2017 21:02:02 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id x25sm34033796pfi.58.2017.07.02.21.01.58 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 02 Jul 2017 21:02:01 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 03 Jul 2017 13:31:54 +0930 From: Joel Stanley To: Michael Ellerman , "Gautham R . Shenoy" Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] powerpc/powernv/idle: Put pnv_cpu_offline behind HOTPLUG_CPU Date: Mon, 3 Jul 2017 13:31:52 +0930 Message-Id: <20170703040152.5144-1-joel@jms.id.au> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In commit 900612315788 ("powerpc/powernv/smp: Add busy-wait loop as fall back for CPU-Hotplug") the idle code uses generic_check_cpu_restart(), but that function is not available when CONFIG_HOTPLUG_CPU is disabled. arch/powerpc/platforms/powernv/idle.c: In function ‘pnv_cpu_offline’: arch/powerpc/platforms/powernv/idle.c:286:11: error: implicit declaration of function ‘generic_check_cpu_restart’ [-Werror=implicit-function-declaration] while (!generic_check_cpu_restart(cpu)) { ^~~~~~~~~~~~~~~~~~~~~~~~~ The callers of pnv_cpu_offline are behind CONFIG_HOTPLUG_CPU, so fix the build error by putting this code behind the same gard. Fixes: 900612315788 ("powerpc/powernv/smp: Add busy-wait loop as fall back for CPU-Hotplug"). Cc: # 4.12 Signed-off-by: Joel Stanley --- arch/powerpc/platforms/powernv/idle.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.13.2 diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 445f30a2c5ef..b15d108db216 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -261,6 +261,8 @@ static u64 pnv_deepest_stop_psscr_val; static u64 pnv_deepest_stop_psscr_mask; static bool deepest_stop_found; +#ifdef CONFIG_HOTPLUG_CPU + /* * pnv_cpu_offline: A function that puts the CPU into the deepest * available platform idle state on a CPU-Offline. @@ -294,6 +296,8 @@ unsigned long pnv_cpu_offline(unsigned int cpu) return srr1; } +#endif /* CONFIG_HOTPLUG_CPU */ + /* * Power ISA 3.0 idle initialization. *