diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-29 18:29:01 +0100 |
commit | b73117c49364551ff789db7c424a115ac5b77850 (patch) | |
tree | e151d34e68ef6061f1ac10f5db0aff262dc3aff5 /arch/powerpc/include/asm/switch_to.h | |
parent | 77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8 (diff) | |
parent | 4068890931f62752abc3591e7b3736e7537c6dcb (diff) | |
download | blackbird-op-linux-b73117c49364551ff789db7c424a115ac5b77850.tar.gz blackbird-op-linux-b73117c49364551ff789db7c424a115ac5b77850.zip |
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
Diffstat (limited to 'arch/powerpc/include/asm/switch_to.h')
-rw-r--r-- | arch/powerpc/include/asm/switch_to.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/switch_to.h b/arch/powerpc/include/asm/switch_to.h index aace90547614..0e83e7d8c73f 100644 --- a/arch/powerpc/include/asm/switch_to.h +++ b/arch/powerpc/include/asm/switch_to.h @@ -25,10 +25,8 @@ static inline void save_tar(struct thread_struct *prev) static inline void save_tar(struct thread_struct *prev) {} #endif -extern void load_up_fpu(void); extern void enable_kernel_fp(void); extern void enable_kernel_altivec(void); -extern void load_up_altivec(struct task_struct *); extern int emulate_altivec(struct pt_regs *); extern void __giveup_vsx(struct task_struct *); extern void giveup_vsx(struct task_struct *); |