From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [percpu] Convert remaining __get_cpu_var uses in 3.18-rcX
Date: Mon, 27 Oct 2014 15:59:11 +0000 [thread overview]
Message-ID: <20141027155910.GX8768@arm.com> (raw)
In-Reply-To: <alpine.DEB.2.11.1410271047400.17089@gentwo.org>
On Mon, Oct 27, 2014 at 03:49:45PM +0000, Christoph Lameter wrote:
> During the 3.18 merge period additional __get_cpu_var uses were
> added. The patch converts these to this_cpu_ptr().
>
> Signed-off-by: Christoph Lameter <cl@linux.com>
>
> Index: linux/arch/arm64/kernel/psci.c
> ===================================================================
> --- linux.orig/arch/arm64/kernel/psci.c
> +++ linux/arch/arm64/kernel/psci.c
> @@ -511,7 +511,7 @@ static int cpu_psci_cpu_kill(unsigned in
>
> static int psci_suspend_finisher(unsigned long index)
> {
> - struct psci_power_state *state = __get_cpu_var(psci_power_state);
> + struct psci_power_state *state = __this_cpu_read(psci_power_state);
>
> return psci_ops.cpu_suspend(state[index - 1],
> virt_to_phys(cpu_resume));
> @@ -520,7 +520,7 @@ static int psci_suspend_finisher(unsigne
> static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index)
> {
> int ret;
> - struct psci_power_state *state = __get_cpu_var(psci_power_state);
> + struct psci_power_state *state = __this_cpu_read(psci_power_state);
> /*
> * idle state index 0 corresponds to wfi, should never be called
> * from the cpu_suspend operations
Apologies for not spotting this one during review:
Acked-by: Will Deacon <will.deacon@arm.com>
Feel free to take this via some other route (than the arm64 tree).
Will
next prev parent reply other threads:[~2014-10-27 15:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 15:49 [percpu] Convert remaining __get_cpu_var uses in 3.18-rcX Christoph Lameter
2014-10-27 15:59 ` Will Deacon [this message]
2014-10-28 15:33 ` Thomas Gleixner
2014-10-29 15:19 ` Tejun Heo
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=20141027155910.GX8768@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).