git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6965f7)
powerpc/kvm/book3s_32: Fix MTMSR_EERI macro
authorAlexander Graf <agraf@suse.de>
Mon, 30 Jul 2012 12:32:59 +0000 (12:32 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 31 Jul 2012 05:21:20 +0000 (15:21 +1000)
Commit b38c77d82e4 moved the MTMSR_EERI macro from the KVM code to generic
ppc_asm.h code. However, while adding it in the headers for the ppc32 case,
it missed out to remove the former definition in the KVM code.

This patch fixes compilation on server type PPC32 targets with CONFIG_KVM
enabled.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kvm/book3s_rmhandlers.S patch | blob | history

diff --cc arch/powerpc/kvm/book3s_rmhandlers.S
Simple merge
Pandora Kernel Repository