From: tip-bot for Preeti U Murthy <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, nicolas.pitre@linaro.org,
preeti@linux.vnet.ibm.com, tglx@linutronix.de,
sfr@canb.auug.org.au
Subject: [tip:sched/core] cpuidle/pseries: Fix fallout caused due to cleanup in pseries cpuidle backend driver
Date: Tue, 11 Feb 2014 23:09:33 -0800 [thread overview]
Message-ID: <tip-3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9@git.kernel.org> (raw)
In-Reply-To: <52FAFD2D.2090306@linux.vnet.ibm.com>
Commit-ID: 3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9
Gitweb: http://git.kernel.org/tip/3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9
Author: Preeti U Murthy <preeti@linux.vnet.ibm.com>
AuthorDate: Wed, 12 Feb 2014 10:18:45 +0530
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 12 Feb 2014 08:05:03 +0100
cpuidle/pseries: Fix fallout caused due to cleanup in pseries cpuidle backend driver
Commit d8c6ad3184ca651 ("sched/idle, PPC: Remove redundant
cpuidle_idle_call()") reintroduced ppc64_runlatch_off/on() in the
pseries cpuidle backend driver. Hence the cleanup caused by the
commit "c0c4301c54adde05:pseries/cpuidle: Remove redundant call
to ppc64_runlatch_off() in cpu idle routines" in conjuction
with the commit d8c6ad3184ca651 causes a build failure.
Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/52FAFD2D.2090306@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/cpuidle/cpuidle-pseries.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/cpuidle/cpuidle-pseries.c b/drivers/cpuidle/cpuidle-pseries.c
index d486489..6f7b019 100644
--- a/drivers/cpuidle/cpuidle-pseries.c
+++ b/drivers/cpuidle/cpuidle-pseries.c
@@ -17,6 +17,7 @@
#include <asm/reg.h>
#include <asm/machdep.h>
#include <asm/firmware.h>
+#include <asm/runlatch.h>
#include <asm/plpar_wrappers.h>
struct cpuidle_driver pseries_idle_driver = {
prev parent reply other threads:[~2014-02-12 7:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 2:41 linux-next: build failure after merge of the tip tree Stephen Rothwell
2014-02-12 4:48 ` Preeti U Murthy
2014-02-12 7:09 ` tip-bot for Preeti U Murthy [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=tip-3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=peterz@infradead.org \
--cc=preeti@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).