diff options
| author | Avi Kivity <avi@redhat.com> | 2012-07-15 05:41:47 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-15 05:41:47 -0400 |
| commit | 64604e09ec3389cfc9668136a9302a3832cf0095 (patch) | |
| tree | 0eecb2833d8279f634aaff436e97c79837f48cbd /arch/x86/include/asm/apic.h | |
| parent | ad756a1603c5fac207758faaac7f01c34c9d0b7b (diff) | |
| parent | 0c1fc3c3c496f8719fbea7fd3668491413ad420e (diff) | |
Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next
ppc queue from Alex Graf:
* Prepare some of the booke code for 64 bit support
* BookE: Fix ESR flag in DSI
* BookE: Add rfci emulation
* 'for-upstream' of git://github.com/agraf/linux-2.6:
KVM: PPC: Critical interrupt emulation support
KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests
KVM: PPC64: booke: Set interrupt computation mode for 64-bit host
KVM: PPC: bookehv: Add ESR flag to Data Storage Interrupt
KVM: PPC: bookehv64: Add support for std/ld emulation.
booke: Added crit/mc exception handler for e500v2
booke/bookehv: Add host crit-watchdog exception support
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
0 files changed, 0 insertions, 0 deletions