From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: linux-kernel@vger•kernel.org
Cc: "Peter Zijlstra \(Intel\)" <peterz@infradead•org>,
heiko.carstens@de•ibm.com, paulus@samba•org,
stable@vger•kernel.org, Ingo Molnar <mingo@kernel•org>,
linux@arm•linux.org.uk,
Linus Torvalds <torvalds@linux-foundation•org>,
mgorman@suse•de, catalin.marinas@arm•com,
"Paul E. McKenney" <paulmck@linux•vnet.ibm.com>,
liuj97@gmail•com, will.deacon@arm•com, rostedt@goodmis•org,
jbaron@akamai•com, Anton Blanchard <anton@samba•org>,
Thomas Gleixner <tglx@linutronix•de>,
mmarek@suse•cz, Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
ralf@linux-mips•org, schwidefsky@de•ibm.com,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org, davem@davemloft•net
Subject: [PATCH 4.0 145/220] powerpc, jump_label: Include linux/jump_label.h to get HAVE_JUMP_LABEL define
Date: Sat, 2 May 2015 21:01:00 +0200 [thread overview]
Message-ID: <20150502185900.592074628@linuxfoundation.org> (raw)
In-Reply-To: <20150502185854.333748961@linuxfoundation.org>
4.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <anton@samba•org>
commit 58995a9a5b292458f94a2356b8c878230fa56fe0 upstream.
Commit 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
converted uses of CONFIG_JUMP_LABEL to HAVE_JUMP_LABEL in
some assembly files.
HAVE_JUMP_LABEL is defined in linux/jump_label.h, so we need to
include this or we always get the non jump label fallback code.
Signed-off-by: Anton Blanchard <anton@samba•org>
Acked-by: Michael Ellerman <mpe@ellerman•id.au>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead•org>
Cc: Andrew Morton <akpm@linux-foundation•org>
Cc: Linus Torvalds <torvalds@linux-foundation•org>
Cc: Paul E. McKenney <paulmck@linux•vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead•org>
Cc: Thomas Gleixner <tglx@linutronix•de>
Cc: benh@kernel•crashing.org
Cc: catalin.marinas@arm•com
Cc: davem@davemloft•net
Cc: heiko.carstens@de•ibm.com
Cc: jbaron@akamai•com
Cc: linux@arm•linux.org.uk
Cc: linuxppc-dev@lists•ozlabs.org
Cc: liuj97@gmail•com
Cc: mgorman@suse•de
Cc: mmarek@suse•cz
Cc: paulus@samba•org
Cc: ralf@linux-mips•org
Cc: rostedt@goodmis•org
Cc: schwidefsky@de•ibm.com
Cc: will.deacon@arm•com
Fixes: 1bc9e47aa8e4 ("powerpc/jump_label: Use HAVE_JUMP_LABEL")
Link: http://lkml.kernel.org/r/1428551492-21977-3-git-send-email-anton@samba.org
Signed-off-by: Ingo Molnar <mingo@kernel•org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
---
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +-
arch/powerpc/platforms/pseries/hvCall.S | 2 +-
arch/powerpc/platforms/pseries/lpar.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -9,11 +9,11 @@
* 2 of the License, or (at your option) any later version.
*/
+#include <linux/jump_label.h>
#include <asm/ppc_asm.h>
#include <asm/hvcall.h>
#include <asm/asm-offsets.h>
#include <asm/opal.h>
-#include <asm/jump_label.h>
.section ".text"
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -7,12 +7,12 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
+#include <linux/jump_label.h>
#include <asm/hvcall.h>
#include <asm/processor.h>
#include <asm/ppc_asm.h>
#include <asm/asm-offsets.h>
#include <asm/ptrace.h>
-#include <asm/jump_label.h>
.section ".text"
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -26,7 +26,7 @@
#include <linux/dma-mapping.h>
#include <linux/console.h>
#include <linux/export.h>
-#include <linux/static_key.h>
+#include <linux/jump_label.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/page.h>
parent reply other threads:[~2015-05-02 19:18 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20150502185854.333748961@linuxfoundation.org>]
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=20150502185900.592074628@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anton@samba$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jbaron@akamai$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=liuj97@gmail$(echo .)com \
--cc=mgorman@suse$(echo .)de \
--cc=mingo@kernel$(echo .)org \
--cc=mmarek@suse$(echo .)cz \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
--cc=paulus@samba$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=ralf@linux-mips$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=stable@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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