]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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
arch/powerpc/kernel/traps.c

index 5a8b82aa7241c1d6fae279ebf80864a94db32558..4358e3002f35a3c40c481f9680d891ec94502c2e 100644 (file)
@@ -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;
index ad20dcfaedd0eb8648126c869b2334f7f0ac9c3c..62c3dd8c69f21d3d5373d7c79d0ea6ab1a69ed0f 100644 (file)
@@ -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),