git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b60c5a7)
powerpc: Fix PPC_EMULATED_STATS build break with sync patch
authorScott Wood <scottwood@freescale.com>
Tue, 29 Oct 2013 03:07:59 +0000 (22:07 -0500)
committerScott Wood <scottwood@freescale.com>
Tue, 29 Oct 2013 03:08:55 +0000 (22:08 -0500)
Commit 9863c28a2af90a56c088f5f6288d7f6d2c923c14 ("powerpc: Emulate sync
instruction variants") introduced a build breakage with
CONFIG_PPC_EMULATED_STATS enabled.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Kumar Gala <galak@kernel.org>
Cc: James Yang <James.Yang@freescale.com>
---

arch/powerpc/include/asm/emulated_ops.h patch | blob | history
arch/powerpc/kernel/traps.c patch | blob | history

diff --cc arch/powerpc/kernel/traps.c
Simple merge
Pandora Kernel Repository