Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593adf31 authored May 11, 2011 by Paul Mackerras Committed by Benjamin Herrenschmidt May 20, 2011

powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors



Commits a5d4f3ad ("powerpc: Base support for exceptions using
HSRR0/1") and 673b189a ("powerpc: Always use SPRN_SPRG_HSCRATCH0
when running in HV mode") cause compile and link errors for 32-bit
classic Book 3S processors when KVM is enabled.  This fixes these
errors.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 44075d95

arch/powerpc/include/asm/reg.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -824,6 +824,11 @@
		FTR_SECTION_ELSE_NESTED(66); \
		mtspr SPRN_SPRG_HSCRATCH0,rX; \
		ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)

		#else /* CONFIG_PPC_BOOK3S_64 */
		#define GET_SCRATCH0(rX) mfspr rX,SPRN_SPRG_SCRATCH0
		#define SET_SCRATCH0(rX) mtspr SPRN_SPRG_SCRATCH0,rX

		#endif

		#ifdef CONFIG_PPC_BOOK3E_64

arch/powerpc/kvm/book3s_rmhandlers.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -112,7 +112,9 @@ INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_MACHINE_CHECK
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_DATA_STORAGE
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_INST_STORAGE
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_EXTERNAL
		#ifdef CONFIG_PPC_BOOK3S_64
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_EXTERNAL_HV
		#endif
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_ALIGNMENT
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_PROGRAM
		INTERRUPT_TRAMPOLINE BOOK3S_INTERRUPT_FP_UNAVAIL