Commit f9294e98 authored Mar 22, 2013 by Stuart Yoder Committed by Stephen Rothwell Mar 26, 2013

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: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

parent 087aa036

arch/powerpc/kernel/epapr_paravirt.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -23,8 +23,10 @@
		#include <asm/code-patching.h>
		#include <asm/machdep.h>

		#if !defined(CONFIG_64BIT) \|\| defined(CONFIG_PPC_BOOK3E_64)
		extern void epapr_ev_idle(void);
		extern u32 epapr_ev_idle_start[];
		#endif

		bool epapr_paravirt_enabled;

		@@ -47,11 +49,15 @@ static int __init epapr_paravirt_init(void)

		for (i = 0; i < (len / 4); 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]);
		#endif
		}

		#if !defined(CONFIG_64BIT) \|\| defined(CONFIG_PPC_BOOK3E_64)
		if (of_get_property(hyper_node, "has-idle", NULL))
		ppc_md.power_save = epapr_ev_idle;
		#endif

		epapr_paravirt_enabled = true;