diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
| commit | 7227fc0666606b0df2c0d2966a7f4859b01bdf74 (patch) | |
| tree | 2effa7ffe302b1ef917b29973cb5b3bc9343ce8b /arch/powerpc/include/asm/tm.h | |
| parent | 6acdb1603a7db4c1b5d91863a13d2c3f1b9188b0 (diff) | |
| parent | 72cde5a88d37ba88ad1d47aecf957a9e528636d7 (diff) | |
| download | op-kernel-dev-7227fc0666606b0df2c0d2966a7f4859b01bdf74.zip op-kernel-dev-7227fc0666606b0df2c0d2966a7f4859b01bdf74.tar.gz | |
Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next
Diffstat (limited to 'arch/powerpc/include/asm/tm.h')
| -rw-r--r-- | arch/powerpc/include/asm/tm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h index 0c9f8b7..c22d704 100644 --- a/arch/powerpc/include/asm/tm.h +++ b/arch/powerpc/include/asm/tm.h @@ -7,6 +7,8 @@ #include <uapi/asm/tm.h> +#ifndef __ASSEMBLY__ + #ifdef CONFIG_PPC_TRANSACTIONAL_MEM extern void do_load_up_transact_fpu(struct thread_struct *thread); extern void do_load_up_transact_altivec(struct thread_struct *thread); @@ -21,3 +23,5 @@ extern void tm_recheckpoint(struct thread_struct *thread, extern void tm_abort(uint8_t cause); extern void tm_save_sprs(struct thread_struct *thread); extern void tm_restore_sprs(struct thread_struct *thread); + +#endif /* __ASSEMBLY__ */ |
