diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 10:26:23 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 10:26:23 +1100 |
| commit | 2f29e3a561017b95f5c3e40b7d66ec8bbd632d2d (patch) | |
| tree | b54979117db6804ad3c8c88ef341c0dd1e30779f /arch/powerpc/include/asm/emulated_ops.h | |
| parent | bcd77ffc5d8ff3c9056927fb7aa855164b982053 (diff) | |
| parent | a3821b2af185b64e3382c45fbdaa2cbc91ce14b8 (diff) | |
Merge remote-tracking branch 'scott/next' into next
Highlights include corenet board file consolidation, the ability to run
userspaces with lwsync on e500v1/v2, some cleanup patches that other KVM
patches will build on, support for stripped-down e6500 emulation targets,
and some fixes of minor longstanding issues.
Diffstat (limited to 'arch/powerpc/include/asm/emulated_ops.h')
| -rw-r--r-- | arch/powerpc/include/asm/emulated_ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h index 5a8b82aa724..4358e3002f3 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; |