diff options
| author | Linus Torvalds | 2013-12-20 21:26:54 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2013-12-20 21:26:54 +0100 |
| commit | 46dd0835cacd149a981254864af9f41e7c841a94 (patch) | |
| tree | 650d0ac389031e9126a1a83a7ab4518ae45b4e27 /arch/powerpc/include/asm/switch_to.h | |
| parent | mm: do not allocate page->ptl dynamically, if spinlock_t fits to long (diff) | |
| parent | Merge tag 'signed-for-3.13' of git://github.com/agraf/linux-2.6 into kvm-master (diff) | |
| download | kernel-qcow2-linux-46dd0835cacd149a981254864af9f41e7c841a94.tar.gz kernel-qcow2-linux-46dd0835cacd149a981254864af9f41e7c841a94.tar.xz kernel-qcow2-linux-46dd0835cacd149a981254864af9f41e7c841a94.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"The PPC folks had a large amount of changes queued for 3.13, and now
they are fixing the bugs"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: PPC: Book3S HV: Don't drop low-order page address bits
powerpc: book3s: kvm: Don't abuse host r2 in exit path
powerpc/kvm/booke: Fix build break due to stack frame size warning
KVM: PPC: Book3S: PR: Enable interrupts earlier
KVM: PPC: Book3S: PR: Make svcpu -> vcpu store preempt savvy
KVM: PPC: Book3S: PR: Export kvmppc_copy_to|from_svcpu
KVM: PPC: Book3S: PR: Don't clobber our exit handler id
powerpc: kvm: fix rare but potential deadlock scene
KVM: PPC: Book3S HV: Take SRCU read lock around kvm_read_guest() call
KVM: PPC: Book3S HV: Make tbacct_lock irq-safe
KVM: PPC: Book3S HV: Refine barriers in guest entry/exit
KVM: PPC: Book3S HV: Fix physical address calculations
Diffstat (limited to 'arch/powerpc/include/asm/switch_to.h')
| -rw-r--r-- | arch/powerpc/include/asm/switch_to.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/switch_to.h b/arch/powerpc/include/asm/switch_to.h index 9ee12610af02..aace90547614 100644 --- a/arch/powerpc/include/asm/switch_to.h +++ b/arch/powerpc/include/asm/switch_to.h @@ -35,7 +35,7 @@ extern void giveup_vsx(struct task_struct *); extern void enable_kernel_spe(void); extern void giveup_spe(struct task_struct *); extern void load_up_spe(struct task_struct *); -extern void switch_booke_debug_regs(struct thread_struct *new_thread); +extern void switch_booke_debug_regs(struct debug_reg *new_debug); #ifndef CONFIG_SMP extern void discard_lazy_cpu_state(void); |