diff options
author | Scott Wood <scottwood@freescale.com> | 2013-10-28 23:07:59 -0400 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2013-10-28 23:08:55 -0400 |
commit | a3821b2af185b64e3382c45fbdaa2cbc91ce14b8 (patch) | |
tree | 0d3dac805b6700a1f4cd7500934de5e74f98bae9 | |
parent | b60c5a7a82cdfec2221263ce259faa4a36696163 (diff) |
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>
---
-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 { | |||
43 | struct ppc_emulated_entry popcntb; | 43 | struct ppc_emulated_entry popcntb; |
44 | struct ppc_emulated_entry spe; | 44 | struct ppc_emulated_entry spe; |
45 | struct ppc_emulated_entry string; | 45 | struct ppc_emulated_entry string; |
46 | struct ppc_emulated_entry sync; | ||
46 | struct ppc_emulated_entry unaligned; | 47 | struct ppc_emulated_entry unaligned; |
47 | #ifdef CONFIG_MATH_EMULATION | 48 | #ifdef CONFIG_MATH_EMULATION |
48 | struct ppc_emulated_entry math; | 49 | 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 = { | |||
1820 | WARN_EMULATED_SETUP(popcntb), | 1820 | WARN_EMULATED_SETUP(popcntb), |
1821 | WARN_EMULATED_SETUP(spe), | 1821 | WARN_EMULATED_SETUP(spe), |
1822 | WARN_EMULATED_SETUP(string), | 1822 | WARN_EMULATED_SETUP(string), |
1823 | WARN_EMULATED_SETUP(sync), | ||
1823 | WARN_EMULATED_SETUP(unaligned), | 1824 | WARN_EMULATED_SETUP(unaligned), |
1824 | #ifdef CONFIG_MATH_EMULATION | 1825 | #ifdef CONFIG_MATH_EMULATION |
1825 | WARN_EMULATED_SETUP(math), | 1826 | WARN_EMULATED_SETUP(math), |