diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-10-29 04:07:59 +0100 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-29 04:08:55 +0100 |
| commit | a3821b2af185b64e3382c45fbdaa2cbc91ce14b8 (patch) | |
| tree | 0d3dac805b6700a1f4cd7500934de5e74f98bae9 /arch | |
| parent | powerpc/6xx: CONFIG_MCU_MPC8349EMITX cannot be a module (diff) | |
| download | linux-a3821b2af185b64e3382c45fbdaa2cbc91ce14b8.tar.xz linux-a3821b2af185b64e3382c45fbdaa2cbc91ce14b8.zip | |
powerpc: Fix PPC_EMULATED_STATS build break with sync patch
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>
---
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/emulated_ops.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h index 5a8b82aa7241..4358e3002f35 100644 --- a/arch/powerpc/include/asm/emulated_ops.h +++ b/arch/powerpc/include/asm/emulated_ops.h @@ -43,6 +43,7 @@ extern struct ppc_emulated { struct ppc_emulated_entry popcntb; struct ppc_emulated_entry spe; struct ppc_emulated_entry string; + struct ppc_emulated_entry sync; struct ppc_emulated_entry unaligned; #ifdef CONFIG_MATH_EMULATION struct ppc_emulated_entry math; diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index ad20dcfaedd0..62c3dd8c69f2 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -1820,6 +1820,7 @@ struct ppc_emulated ppc_emulated = { WARN_EMULATED_SETUP(popcntb), WARN_EMULATED_SETUP(spe), WARN_EMULATED_SETUP(string), + WARN_EMULATED_SETUP(sync), WARN_EMULATED_SETUP(unaligned), #ifdef CONFIG_MATH_EMULATION WARN_EMULATED_SETUP(math), |