mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
This merges branches irq/genirq, irq/sparseirq-v4, timers/hpet-percpu and x86/uv. The sparseirq branch is just preliminary groundwork: no sparse IRQs are actually implemented by this tree anymore - just the new APIs are added while keeping the old way intact as well (the new APIs map 1:1 to irq_desc[]). The 'real' sparse IRQ support will then be a relatively small patch ontop of this - with a v2.6.29 merge target. * 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (178 commits) genirq: improve include files intr_remapping: fix typo io_apic: make irq_mis_count available on 64-bit too genirq: fix name space collisions of nr_irqs in arch/* genirq: fix name space collision of nr_irqs in autoprobe.c genirq: use iterators for irq_desc loops proc: fixup irq iterator genirq: add reverse iterator for irq_desc x86: move ack_bad_irq() to irq.c x86: unify show_interrupts() and proc helpers x86: cleanup show_interrupts genirq: cleanup the sparseirq modifications genirq: remove artifacts from sparseirq removal genirq: revert dynarray genirq: remove irq_to_desc_alloc genirq: remove sparse irq code genirq: use inline function for irq_to_desc genirq: consolidate nr_irqs and for_each_irq_desc() x86: remove sparse irq from Kconfig genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n ...
This commit is contained in:
commit
9301975ec2
111 changed files with 3716 additions and 6226 deletions
|
|
@ -337,7 +337,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc)
|
|||
#else
|
||||
#define IRQ_MIN 9
|
||||
#if defined(__PPC)
|
||||
#define IRQ_MAX (NR_IRQS-1)
|
||||
#define IRQ_MAX (nr_irqs-1)
|
||||
#else
|
||||
#define IRQ_MAX 12
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2108,7 +2108,7 @@ struct scsi_qla_host;
|
|||
|
||||
struct qla_msix_entry {
|
||||
int have_irq;
|
||||
uint16_t msix_vector;
|
||||
uint32_t msix_vector;
|
||||
uint16_t msix_entry;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue