diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 18:38:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 18:38:11 -0700 |
| commit | f08b9c2f8af0d61faa1170aeae4fbca1eff6a504 (patch) | |
| tree | 367b04b7750b66c8412bd377e549aa0fb5b3df02 /drivers/scsi/scsi_error.c | |
| parent | d79ee93de909dfb252279b9a95978bbda9a814a9 (diff) | |
| parent | 0ab711ae6ab0db7696b43c74f9ba9de4d7fc1deb (diff) | |
| download | blackbird-op-linux-f08b9c2f8af0d61faa1170aeae4fbca1eff6a504.tar.gz blackbird-op-linux-f08b9c2f8af0d61faa1170aeae4fbca1eff6a504.zip | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/apic changes from Ingo Molnar:
"Most of the changes are about helping virtualized guest kernels
achieve better performance."
Fix up trivial conflicts with the iommu updates to arch/x86/kernel/apic/io_apic.c
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic: Implement EIO micro-optimization
x86/apic: Add apic->eoi_write() callback
x86/apic: Use symbolic APIC_EOI_ACK
x86/apic: Fix typo EIO_ACK -> EOI_ACK and document it
x86/xen/apic: Add missing #include <xen/xen.h>
x86/apic: Only compile local function if used with !CONFIG_GENERIC_PENDING_IRQ
x86/apic: Fix UP boot crash
x86: Conditionally update time when ack-ing pending irqs
xen/apic: implement io apic read with hypercall
Revert "xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'"
xen/x86: Implement x86_apic_ops
x86/apic: Replace io_apic_ops with x86_io_apic_ops.
Diffstat (limited to 'drivers/scsi/scsi_error.c')
0 files changed, 0 insertions, 0 deletions
