diff options
| author | Alexander Graf <agraf@suse.de> | 2012-07-30 08:32:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-31 01:21:20 -0400 |
| commit | ad36cb0d1d3e2b7f161cd33932433f9349cade1e (patch) | |
| tree | ed78d456b86b968ffe64fa24e7db4af4025e3298 /arch/powerpc | |
| parent | b6965f7967a64b185d7ff4cc4bcf15c380c1348f (diff) | |
powerpc/kvm/book3s_32: Fix MTMSR_EERI macro
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kvm/book3s_rmhandlers.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S index ab523f3c1731..9ecf6e35cd8d 100644 --- a/arch/powerpc/kvm/book3s_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S | |||
| @@ -67,7 +67,6 @@ kvmppc_skip_Hinterrupt: | |||
| 67 | #elif defined(CONFIG_PPC_BOOK3S_32) | 67 | #elif defined(CONFIG_PPC_BOOK3S_32) |
| 68 | 68 | ||
| 69 | #define FUNC(name) name | 69 | #define FUNC(name) name |
| 70 | #define MTMSR_EERI(reg) mtmsr (reg) | ||
| 71 | 70 | ||
| 72 | .macro INTERRUPT_TRAMPOLINE intno | 71 | .macro INTERRUPT_TRAMPOLINE intno |
| 73 | 72 | ||