Commit f9294e98 authored by Stuart Yoder's avatar Stuart Yoder Committed by Stephen Rothwell

powerpc: define the conditions where the ePAPR idle hcall can be supported

For 32-bit, CONFIG_EPAPR_PARAVIRT pulls in both epapr_paravirt.c
and epapr_hcalls.c which contains the 32-bit paravirt idle loop.

For 64-bit, the paravirt idle loop is in idle_book3e.S and that
source file is included only if CONFIG_PPC_BOOK3E_64 defined.

This patch makes that dependency for 64-bit explicit.

Fixes these build errors:

arch/powerpc/kernel/built-in.o: In function `restore_pblist_ptr':
ftrace.c:(.toc+0xdc0): undefined reference to `epapr_ev_idle_start'
ftrace.c:(.toc+0xdd0): undefined reference to `epapr_ev_idle'
Signed-off-by: default avatarStuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 087aa036
...@@ -23,8 +23,10 @@ ...@@ -23,8 +23,10 @@
#include <asm/code-patching.h> #include <asm/code-patching.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
extern void epapr_ev_idle(void); extern void epapr_ev_idle(void);
extern u32 epapr_ev_idle_start[]; extern u32 epapr_ev_idle_start[];
#endif
bool epapr_paravirt_enabled; bool epapr_paravirt_enabled;
...@@ -47,11 +49,15 @@ static int __init epapr_paravirt_init(void) ...@@ -47,11 +49,15 @@ static int __init epapr_paravirt_init(void)
for (i = 0; i < (len / 4); i++) { for (i = 0; i < (len / 4); i++) {
patch_instruction(epapr_hypercall_start + i, insts[i]); patch_instruction(epapr_hypercall_start + i, insts[i]);
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
patch_instruction(epapr_ev_idle_start + i, insts[i]); patch_instruction(epapr_ev_idle_start + i, insts[i]);
#endif
} }
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
if (of_get_property(hyper_node, "has-idle", NULL)) if (of_get_property(hyper_node, "has-idle", NULL))
ppc_md.power_save = epapr_ev_idle; ppc_md.power_save = epapr_ev_idle;
#endif
epapr_paravirt_enabled = true; epapr_paravirt_enabled = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment