x86: apic - unify lapic_resume - fix
Subsystems (35)
PATCH 1/1 x86: apic - unify lapic_resume - fix
arch/x86/kernel/apic_64.c +2 -0
@@ -1448,6 +1448,7 @@ static int lapic_resume(struct sys_device *dev)enable_x2apic (); else#endif + {/* * Make sure the APICBASE points to the right address *
@@ -1458,6 +1459,7 @@ static int lapic_resume(struct sys_device *dev) l &= ~MSR_IA32_APICBASE_BASE ; l |=MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;wrmsr (MSR_IA32_APICBASE , l, h); + }apic_write (APIC_LVTERR ,ERROR_APIC_VECTOR |APIC_LVT_MASKED );apic_write (APIC_ID , apic_pm_state.apic_id);
PATCH 1/2 x86: make HAVE_SPARSE_IRQ support selectable
Ingo said sparse_irq is some intrusive. need to make it selectable
to make it simple, remove irq_desc as parameter in some functions. (ack, eoi, set_affinity).
may need to make member if irq_chip to take irq_desc, or struct irq later.
--- arch/Kconfig | 3 - arch/x86/Kconfig | 12 ++++ arch/x86/kernel/io_apic.c | 124 ++++++++++++++++++++++++++++++---------------- arch/x86/kernel/irq_32.c | 2 arch/x86/kernel/irq_64.c | 4 - include/linux/irq.h | 12 ---- kernel/irq/chip.c | 26 --------- kernel/irq/handle.c | 34 +----------- kernel/irq/manage.c | 8 -- kernel/irq/migration.c | 8 -- 10 files changed, 103 insertions(+), 130 deletions(-)
arch/Kconfig +0 -3
@@ -106,6 +106,3 @@ config HAVE_CLK config HAVE_DYN_ARRAY def_bool n -config HAVE_SPARSE_IRQ - def_bool n -
arch/x86/Kconfig +11 -1
@@ -34,7 +34,6 @@ config X86 select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_DYN_ARRAY - select HAVE_SPARSE_IRQ config ARCH_DEFCONFIG string
@@ -241,6 +240,17 @@ config SMP If you don't know what to do here, say N. +config HAVE_SPARSE_IRQ + bool "Support sparse irq numbering" + depends on PCI_MSI || HT_IRQ + default y + help + This enables support for sparse irq, esp for msi/msi-x. the irq + number will be bus/dev/fn + 12bit. You may need if you have lots of + cards supports msi-x installed. + + If you don't know what to do here, say Y. + config X86_FIND_SMP_CONFIG def_bool y depends on X86_MPPARSE || X86_VOYAGER
arch/x86/kernel/io_apic.c +81 -43
338 lines not on this page · raw message
arch/x86/kernel/irq_64.c +2 -2
@@ -74,7 +74,7 @@ int show_interrupts(struct seq_file *p,struct irqaction * action;unsigned long flags;unsigned int entries; -struct irq_desc *desc; +struct irq_desc *desc =NULL ;int tail =0 ;#ifdef CONFIG_HAVE_SPARSE_IRQ
@@ -275,7 +275,7 @@ void fixup_irqs(cpumask_t map) desc->chip->mask (irq);if (desc->chip->set_affinity) - desc->chip->set_affinity (irq, desc, mask); + desc->chip->set_affinity (irq, mask);else if (!(warned++)) set_affinity =0 ;
include/linux/irq.h +0 -12
@@ -104,26 +104,14 @@ struct irq_chip {void (*enable)(unsigned int irq);void (*disable)(unsigned int irq); -#ifdef CONFIG_HAVE_SPARSE_IRQ -void (*ack)(unsigned int irq,struct irq_desc *desc); -#else void (*ack)(unsigned int irq); -#endif void (*mask)(unsigned int irq);void (*mask_ack)(unsigned int irq);void (*unmask)(unsigned int irq); -#ifdef CONFIG_HAVE_SPARSE_IRQ -void (*eoi)(unsigned int irq,struct irq_desc *desc); -#else void (*eoi)(unsigned int irq); -#endif void (*end)(unsigned int irq); -#ifdef CONFIG_HAVE_SPARSE_IRQ -void (*set_affinity)(unsigned int irq,struct irq_desc *desc,cpumask_t dest); -#else void (*set_affinity)(unsigned int irq,cpumask_t dest); -#endif int (*retrigger)(unsigned int irq);int (*set_type)(unsigned int irq,unsigned int flow_type);int (*set_wake)(unsigned int irq,unsigned int on);
kernel/irq/chip.c +2 -24
@@ -299,11 +299,7 @@ static inline void mask_ack_irq(struct i desc->chip->mask_ack (irq); else { desc->chip->mask (irq); -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->ack (irq, desc); -#else desc->chip->ack (irq); -#endif } }
@@ -443,11 +439,7 @@ handle_fasteoi_irq(unsigned int irq, strspin_lock (&desc->lock); desc->status &= ~IRQ_INPROGRESS ; out: -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->eoi (irq, desc); -#else desc->chip->eoi (irq); -#endif spin_unlock (&desc->lock); }
@@ -490,11 +482,7 @@ handle_edge_irq(unsigned int irq, structkstat_irqs_this_cpu (desc)++;/* Start handling the irq */ -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->ack (irq, desc); -#else desc->chip->ack (irq); -#endif /* Mark the IRQ currently in progress.*/ desc->status |=IRQ_INPROGRESS ;
@@ -548,25 +536,15 @@ handle_percpu_irq(unsigned int irq, strukstat_irqs_this_cpu (desc)++; -if (desc->chip->ack) { -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->ack (irq, desc); -#else +if (desc->chip->ack) desc->chip->ack (irq); -#endif - } action_ret =handle_IRQ_event (irq, desc->action);if (!noirqdebug)note_interrupt (irq, desc, action_ret); -if (desc->chip->eoi) { -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->eoi (irq, desc); -#else +if (desc->chip->eoi) desc->chip->eoi (irq); -#endif - } }void
kernel/irq/handle.c +4 -30
@@ -285,13 +285,6 @@ struct irq_desc *irq_desc_with_new(unsig* What should we do if we get a hw irq event on an illegal vector? * Each architecture has to answer this themself. */ -#ifdef CONFIG_HAVE_SPARSE_IRQ -static void ack_bad (unsigned int irq,struct irq_desc *desc) -{ -print_irq_desc (irq, desc); -ack_bad_irq (irq); -} -#else static void ack_bad (unsigned int irq) {struct irq_desc *desc;
@@ -300,7 +293,6 @@ static void ack_bad(unsigned int irq)print_irq_desc (irq, desc);ack_bad_irq (irq); } -#endif /* * NOP functions
@@ -309,12 +301,6 @@ static void noop(unsigned int irq) { } -#ifdef CONFIG_HAVE_SPARSE_IRQ -static void noop_desc (unsigned int irq,struct irq_desc *desc) -{ -} -#endif -static unsigned int noop_ret (unsigned int irq) {return 0 ;
@@ -343,11 +329,7 @@ struct irq_chip dummy_irq_chip = { .shutdown = noop, .enable = noop, .disable = noop, -#ifdef CONFIG_HAVE_SPARSE_IRQ - .ack = noop_desc, -#else .ack = noop, -#endif .mask = noop, .unmask = noop, .end = noop,
@@ -415,13 +397,9 @@ unsigned int __do_IRQ(unsigned int irq,/* * No locking required for CPU-local interrupts: */ -if (desc->chip->ack) { -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->ack (irq, desc); -#else +if (desc->chip->ack) desc->chip->ack (irq); -#endif - } +if (likely (!(desc->status &IRQ_DISABLED ))) { action_ret =handle_IRQ_event (irq, desc->action);if (!noirqdebug)
@@ -432,13 +410,9 @@ unsigned int __do_IRQ(unsigned int irq, }spin_lock (&desc->lock); -if (desc->chip->ack) { -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->ack (irq, desc); -#else +if (desc->chip->ack) desc->chip->ack (irq); -#endif - } +/* * REPLAY is when Linux resends an IRQ that was dropped earlier * WAITING is used by probe to mark irqs that are being tested
kernel/irq/manage.c +0 -8
@@ -91,11 +91,7 @@ int irq_set_affinity(unsigned int irq, cunsigned long flags;spin_lock_irqsave (&desc->lock, flags); -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->set_affinity (irq, desc, cpumask); -#else desc->chip->set_affinity (irq, cpumask); -#endif spin_unlock_irqrestore (&desc->lock, flags); }else set_pending_irq (irq, cpumask);
@@ -122,11 +118,7 @@ int irq_select_affinity(unsigned int irq desc =irq_desc (irq); desc->affinity = mask; -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->set_affinity (irq, desc, mask); -#else desc->chip->set_affinity (irq, mask); -#endif return 0 ; }
kernel/irq/migration.c +2 -6
@@ -51,13 +51,9 @@ void move_masked_irq(int irq, struct irq* For correct operation this depends on the caller * masking the irqs. */ -if (likely (!cpus_empty (tmp))) { -#ifdef CONFIG_HAVE_SPARSE_IRQ - desc->chip->set_affinity (irq, desc, tmp); -#else +if (likely (!cpus_empty (tmp))) desc->chip->set_affinity (irq, tmp); -#endif - } +cpus_clear (desc->pending_mask); }
arch/x86/kernel/irq_32.c +2 -2
@@ -269,7 +269,7 @@ int show_interrupts(struct seq_file *p,struct irqaction * action;unsigned long flags;unsigned int entries; -struct irq_desc *desc; +struct irq_desc *desc =NULL ;int tail =0 ;#ifdef CONFIG_HAVE_SPARSE_IRQ
@@ -434,7 +434,7 @@ void fixup_irqs(cpumask_t map) mask = map; }if (desc->chip->set_affinity) - desc->chip->set_affinity (irq, desc, mask); + desc->chip->set_affinity (irq, mask);else if (desc->action && !(warned++))printk ("Cannot set affinity for irq %i\n" , irq); }
PATCH 2/2 irq: rename irq_desc() to to_irq_desc()
So could revert back to use irq_desc[] for other arch except x86
--- arch/alpha/kernel/irq.c | 21 +-- arch/alpha/kernel/irq_alpha.c | 7 - arch/alpha/kernel/irq_i8259.c | 8 - arch/alpha/kernel/irq_pyxis.c | 9 - arch/alpha/kernel/irq_srm.c | 9 - arch/alpha/kernel/sys_alcor.c | 9 - arch/alpha/kernel/sys_cabriolet.c | 8 - arch/alpha/kernel/sys_dp264.c | 9 - arch/alpha/kernel/sys_eb64p.c | 8 - arch/alpha/kernel/sys_eiger.c | 7 - arch/alpha/kernel/sys_jensen.c | 50 ++++----- arch/alpha/kernel/sys_marvel.c | 20 +-- arch/alpha/kernel/sys_mikasa.c | 8 - arch/alpha/kernel/sys_noritake.c | 8 - arch/alpha/kernel/sys_rawhide.c | 8 - arch/alpha/kernel/sys_rx164.c | 8 - arch/alpha/kernel/sys_sable.c | 8 - arch/alpha/kernel/sys_takara.c | 8 - arch/alpha/kernel/sys_titan.c | 8 - arch/alpha/kernel/sys_wildfire.c | 19 +-- arch/arm/common/gic.c | 2 arch/arm/common/it8152.c | 2 arch/arm/common/locomo.c | 16 +-- arch/arm/common/sa1111.c | 4 arch/arm/kernel/ecard.c | 4 arch/arm/kernel/irq.c | 8 - arch/arm/mach-at91/gpio.c | 4 arch/arm/mach-davinci/gpio.c | 13 -- arch/arm/mach-ep93xx/core.c | 12 +- arch/arm/mach-footbridge/isa-irq.c | 2 arch/arm/mach-h720x/common.c | 2 arch/arm/mach-h720x/cpu-h7202.c | 2 arch/arm/mach-imx/irq.c | 2 arch/arm/mach-integrator/integrator_cp.c | 2 arch/arm/mach-iop13xx/msi.c | 2 arch/arm/mach-ixp2000/core.c | 4 arch/arm/mach-ixp2000/ixdp2x00.c | 2 arch/arm/mach-ixp2000/ixdp2x01.c | 2 arch/arm/mach-ixp23xx/core.c | 2 arch/arm/mach-ixp23xx/ixdp2351.c | 4 arch/arm/mach-lh7a40x/common.h | 2 arch/arm/mach-netx/generic.c | 2 arch/arm/mach-ns9xxx/board-a9m9750dev.c | 2 arch/arm/mach-omap1/fpga.c | 2 arch/arm/mach-orion5x/irq.c | 12 +- arch/arm/mach-pxa/gpio.c | 2 arch/arm/mach-pxa/lpd270.c | 2 arch/arm/mach-pxa/lubbock.c | 2 arch/arm/mach-pxa/mainstone.c | 2 arch/arm/mach-pxa/pcm990-baseboard.c | 2 arch/arm/mach-s3c2410/bast-irq.c | 6 - arch/arm/mach-s3c2412/irq.c | 4 arch/arm/mach-s3c2440/irq.c | 4 arch/arm/mach-s3c2443/irq.c | 4 arch/arm/mach-sa1100/h3600.c | 14 +- arch/arm/mach-sa1100/irq.c | 2 arch/arm/mach-sa1100/neponset.c | 6 - arch/arm/mach-versatile/core.c | 2 arch/arm/oprofile/op_model_mpcore.c | 2 arch/arm/plat-mxc/gpio.c | 7 - arch/arm/plat-omap/gpio.c | 12 -- arch/arm/plat-orion/irq.c | 2 arch/arm/plat-s3c24xx/irq.c | 14 +- arch/arm/plat-s3c24xx/s3c244x-irq.c | 4 arch/avr32/mach-at32ap/extint.c | 7 - arch/avr32/mach-at32ap/intc.c | 2 arch/avr32/mach-at32ap/pio.c | 2 arch/blackfin/kernel/irqchip.c | 12 -- arch/blackfin/kernel/traps.c | 8 - arch/blackfin/mach-bf537/boards/cm_bf537.c | 2 arch/blackfin/mach-bf537/boards/stamp.c | 2 arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 arch/blackfin/mach-common/ints-priority.c | 8 - arch/cris/arch-v10/kernel/irq.c | 2 arch/cris/arch-v32/kernel/irq.c | 6 - arch/cris/kernel/irq.c | 12 -- arch/frv/kernel/irq.c | 10 - arch/h8300/kernel/irq.c | 24 +--- arch/ia64/hp/sim/hpsim_irq.c | 2 arch/ia64/include/asm/hw_irq.h | 2 arch/ia64/kernel/iosapic.c | 19 +-- arch/ia64/kernel/irq.c | 16 +-- arch/ia64/kernel/irq_ia64.c | 12 +- arch/ia64/kernel/mca.c | 2 arch/ia64/kernel/msi_ia64.c | 4 arch/ia64/kernel/smpboot.c | 2 arch/ia64/sn/kernel/irq.c | 11 -- arch/ia64/sn/kernel/msi_sn.c | 4 arch/m32r/kernel/irq.c | 12 -- arch/m32r/platforms/m32104ut/setup.c | 37 +++--- arch/m32r/platforms/m32700ut/setup.c | 133 +++++++++++------------- arch/m32r/platforms/mappi/setup.c | 84 ++++++--------- arch/m32r/platforms/mappi2/setup.c | 103 +++++++------------ arch/m32r/platforms/mappi3/setup.c | 103 +++++++------------ arch/m32r/platforms/oaks32r/setup.c | 62 ++++------- arch/m32r/platforms/opsput/setup.c | 149 +++++++++++----------------- arch/m32r/platforms/usrv/setup.c | 92 ++++++----------- arch/m68knommu/kernel/irq.c | 18 +-- arch/mips/au1000/common/irq.c | 2 arch/mips/dec/ioasic-irq.c | 2 arch/mips/emma2rh/markeins/irq_markeins.c | 2 arch/mips/kernel/irq-gic.c | 2 arch/mips/kernel/irq-msc01.c | 2 arch/mips/kernel/irq.c | 10 - arch/mips/kernel/smtc.c | 2 arch/mips/mti-malta/malta-smtc.c | 2 arch/mips/sgi-ip22/ip22-int.c | 2 arch/mips/sgi-ip22/ip22-time.c | 2 arch/mips/sgi-ip32/ip32-irq.c | 10 - arch/mips/sibyte/bcm1480/irq.c | 5 arch/mips/sibyte/bcm1480/smp.c | 2 arch/mips/sibyte/sb1250/irq.c | 5 arch/mips/sibyte/sb1250/smp.c | 2 arch/mips/sni/a20r.c | 2 arch/mips/sni/pcimt.c | 2 arch/mips/sni/pcit.c | 2 arch/mips/sni/rm200.c | 2 arch/mips/vr41xx/common/icu.c | 44 ++++---- arch/mips/vr41xx/common/irq.c | 2 arch/mn10300/kernel/irq.c | 13 -- arch/parisc/kernel/irq.c | 41 +++---- arch/powerpc/include/asm/irq.h | 2 arch/powerpc/kernel/crash.c | 2 arch/powerpc/kernel/irq.c | 15 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 2 arch/powerpc/platforms/powermac/pic.c | 4 arch/powerpc/platforms/pseries/eeh_driver.c | 2 arch/powerpc/platforms/pseries/xics.c | 4 arch/powerpc/sysdev/cpm2_pic.c | 5 arch/powerpc/sysdev/mpic.c | 16 +-- arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 arch/sh/boards/mach-cayman/irq.c | 4 arch/sh/boards/mach-dreamcast/irq.c | 2 arch/sh/boards/mach-dreamcast/setup.c | 2 arch/sh/boards/mach-microdev/irq.c | 4 arch/sh/boards/mach-se/7206/irq.c | 2 arch/sh/boards/mach-se/7343/irq.c | 2 arch/sh/boards/mach-se/7722/irq.c | 2 arch/sh/boards/mach-systemh/irq.c | 4 arch/sh/cchips/hd6446x/hd64461.c | 4 arch/sh/cchips/hd6446x/hd64465/setup.c | 4 arch/sh/kernel/cpu/irq/imask.c | 4 arch/sh/kernel/cpu/irq/intc-sh5.c | 4 arch/sh/kernel/irq.c | 12 -- arch/sparc64/kernel/irq.c | 41 +++---- arch/sparc64/kernel/pci_msi.c | 2 arch/sparc64/kernel/time.c | 2 arch/um/kernel/irq.c | 31 ++--- arch/x86/kernel/io_apic.c | 32 +++--- arch/x86/kernel/irq_32.c | 4 arch/x86/kernel/irq_64.c | 4 arch/x86/kernel/irqinit_32.c | 2 arch/x86/kernel/irqinit_64.c | 2 arch/x86/kernel/visws_quirks.c | 8 - arch/x86/mach-voyager/voyager_smp.c | 4 arch/xtensa/kernel/irq.c | 12 -- drivers/char/random.c | 4 drivers/gpio/gpiolib.c | 2 drivers/mfd/asic3.c | 4 drivers/mfd/htc-egpio.c | 2 drivers/parisc/dino.c | 6 - drivers/parisc/eisa.c | 6 - drivers/parisc/gsc.c | 8 - drivers/parisc/iosapic.c | 2 drivers/parisc/superio.c | 4 drivers/pci/intr_remapping.c | 4 drivers/pcmcia/hd64465_ss.c | 4 drivers/xen/events.c | 6 - include/asm-mips/irq.h | 2 include/linux/irq.h | 26 ++-- kernel/irq/autoprobe.c | 10 - kernel/irq/chip.c | 28 ++--- kernel/irq/handle.c | 24 ++-- kernel/irq/manage.c | 26 ++-- kernel/irq/migration.c | 2 kernel/irq/proc.c | 12 +- kernel/irq/resend.c | 2 kernel/irq/spurious.c | 4 178 files changed, 877 insertions(+), 1129 deletions(-)
arch/alpha/kernel/irq.c +8 -13
@@ -46,19 +46,16 @@ int irq_select_affinity(unsigned int irq {static int last_cpu;int cpu = last_cpu +1 ; -struct irq_desc *desc; - desc =irq_desc (irq); - -if (!desc->chip->set_affinity || irq_user_affinity[irq]) +if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])return 1 ;while (!cpu_possible (cpu) || !cpu_isset (cpu, irq_default_affinity)) cpu = (cpu < (NR_CPUS -1 ) ? cpu +1 :0 ); last_cpu = cpu; - desc->affinity =cpumask_of_cpu (cpu); - desc->chip->set_affinity (irq,cpumask_of_cpu (cpu)); + irq_desc[irq].affinity =cpumask_of_cpu (cpu); + irq_desc[irq].chip->set_affinity (irq,cpumask_of_cpu (cpu));return 0 ; }#endif /* CONFIG_SMP */
@@ -83,10 +80,8 @@ show_interrupts(struct seq_file *p, void#endif if (irq <ACTUAL_NR_IRQS ) { -struct irq_desc *desc =irq_desc (irq); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[irq].lock, flags); + action = irq_desc[irq].action;if (!action) goto unlock;seq_printf (p,"%3d: " , irq);
@@ -96,7 +91,7 @@ show_interrupts(struct seq_file *p, voidfor_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (irq, j));#endif -seq_printf (p," %14s" , desc->chip->typename); +seq_printf (p," %14s" , irq_desc[irq].chip->typename);seq_printf (p," %c%s" , (action->flags &IRQF_DISABLED )?'+' :' ' , action->name);
@@ -109,7 +104,7 @@ show_interrupts(struct seq_file *p, voidseq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[irq].lock, flags); }else if (irq ==ACTUAL_NR_IRQS ) {#ifdef CONFIG_SMP seq_puts (p,"IPI: " );
@@ -161,6 +156,6 @@ handle_irq(int irq)* at IPL 0. */ local_irq_disable (); -__do_IRQ (irq,irq_desc (irq)); +__do_IRQ (irq, &irq_desc[irq]);irq_exit (); }
arch/alpha/kernel/irq_alpha.c +3 -4
@@ -64,7 +64,7 @@ do_entInt(unsigned long type, unsigned lsmp_percpu_timer_interrupt (regs); cpu =smp_processor_id ();if (cpu != boot_cpuid) { -irq_desc (RTC_IRQ )->kstat_irqs[cpu]++; + irq_desc[RTC_IRQ ].kstat_irqs[cpu]++; }else {handle_irq (RTC_IRQ ); }
@@ -240,9 +240,8 @@ static struct hw_interrupt_type rtc_irq_void __init init_rtc_irq (void ) { -struct irq_desc *desc =irq_desc (RTC_IRQ ); - desc->status =IRQ_DISABLED ; - desc->chip = &rtc_irq_type; + irq_desc[RTC_IRQ ].status =IRQ_DISABLED ; + irq_desc[RTC_IRQ ].chip = &rtc_irq_type;setup_irq (RTC_IRQ , &timer_irqaction); }
arch/alpha/kernel/irq_i8259.c +3 -5
@@ -79,7 +79,7 @@ i8259a_startup_irq(unsigned int irq)void i8259a_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))i8259a_enable_irq (irq); }
@@ -107,10 +107,8 @@ init_i8259a_irqs(void)outb (0xff ,0xA1 );/* mask all of 8259A-2 */ for (i =0 ; i <16 ; i++) { -struct irq_desc *desc; - desc =irq_desc (i); - desc->status =IRQ_DISABLED ; - desc->chip = &i8259a_irq_type; + irq_desc[i].status =IRQ_DISABLED ; + irq_desc[i].chip = &i8259a_irq_type; }setup_irq (2 , &cascade);
arch/alpha/kernel/irq_pyxis.c +3 -6
@@ -50,7 +50,7 @@ pyxis_startup_irq(unsigned int irq)static void pyxis_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))pyxis_enable_irq (irq); }
@@ -117,13 +117,10 @@ init_pyxis_irqs(unsigned long ignore_mas *(vuip )CIA_IACK_SC ;for (i =16 ; i <48 ; ++i) { -struct irq_desc *desc; -if ((ignore_mask >> i) &1 )continue ; - desc =irq_desc (i); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &pyxis_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &pyxis_irq_type; }setup_irq (16 +7 , &isa_cascade_irqaction);
arch/alpha/kernel/irq_srm.c +3 -6
@@ -43,7 +43,7 @@ srm_startup_irq(unsigned int irq)static void srm_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))srm_enable_irq (irq); }
@@ -64,13 +64,10 @@ init_srm_irqs(long max, unsigned long iglong i;for (i =16 ; i < max; ++i) { -struct irq_desc *desc; -if (i <64 && ((ignore_mask >> i) &1 ))continue ; - desc =irq_desc (i); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &srm_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &srm_irq_type; } }
arch/alpha/kernel/sys_alcor.c +3 -6
@@ -85,7 +85,7 @@ alcor_isa_mask_and_ack_irq(unsigned intstatic void alcor_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))alcor_enable_irq (irq); }
@@ -137,16 +137,13 @@ alcor_init_irq(void) *(vuip )GRU_INT_CLEAR =0 ;mb ();/* all clear */ for (i =16 ; i <48 ; ++i) { -struct irq_desc *desc; -/* On Alcor, at least, lines 20..30 are not connected and can generate spurious interrupts if we turn them on while IRQ probing. */ if (i >=16 +20 && i <=16 +30 )continue ; - desc =irq_desc (i); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &alcor_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &alcor_irq_type; } i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
arch/alpha/kernel/sys_cabriolet.c +3 -5
@@ -67,7 +67,7 @@ cabriolet_startup_irq(unsigned int irq)static void cabriolet_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))cabriolet_enable_irq (irq); }
@@ -122,10 +122,8 @@ common_init_irq(void (*srm_dev_int)(unsioutb (0xff ,0x806 );for (i =16 ; i <35 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &cabriolet_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &cabriolet_irq_type; } }
arch/alpha/kernel/sys_dp264.c +4 -5
@@ -125,7 +125,7 @@ dp264_startup_irq(unsigned int irq)static void dp264_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))dp264_enable_irq (irq); }
@@ -157,7 +157,7 @@ clipper_startup_irq(unsigned int irq)static void clipper_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))clipper_enable_irq (irq); }
@@ -298,9 +298,8 @@ init_tsunami_irqs(struct hw_interrupt_ty {long i;for (i = imin; i <= imax; ++i) { -struct irq_desc *desc =irq_desc (i); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = ops; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = ops; } }
arch/alpha/kernel/sys_eb64p.c +3 -5
@@ -65,7 +65,7 @@ eb64p_startup_irq(unsigned int irq)static void eb64p_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))eb64p_enable_irq (irq); }
@@ -135,10 +135,8 @@ eb64p_init_irq(void)init_i8259a_irqs ();for (i =16 ; i <32 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &eb64p_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &eb64p_irq_type; }common_init_isa_dma ();
arch/alpha/kernel/sys_eiger.c +3 -4
@@ -76,7 +76,7 @@ eiger_startup_irq(unsigned int irq)static void eiger_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))eiger_enable_irq (irq); }
@@ -153,9 +153,8 @@ eiger_init_irq(void)init_i8259a_irqs ();for (i =16 ; i <128 ; ++i) { -struct irq_desc *desc =irq_desc (i); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &eiger_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &eiger_irq_type; } }
arch/alpha/kernel/sys_jensen.c +24 -26
72 lines not on this page · raw message
arch/alpha/kernel/sys_marvel.c +7 -13
@@ -152,7 +152,7 @@ io7_startup_irq(unsigned int irq)static void io7_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))io7_enable_irq (irq); }
@@ -303,10 +303,8 @@ init_io7_irqs(struct io7 *io7,/* Set up the lsi irqs. */ for (i =0 ; i <128 ; ++i) { -struct irq_desc *desc =irq_desc (base + i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = lsi_ops; + irq_desc[base + i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[base + i].chip = lsi_ops; }/* Disable the implemented irqs in hardware. */
@@ -319,10 +317,8 @@ init_io7_irqs(struct io7 *io7,/* Set up the msi irqs. */ for (i =128 ; i < (128 +512 ); ++i) { -struct irq_desc *desc =irq_desc (base + i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = msi_ops; + irq_desc[base + i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[base + i].chip = msi_ops; }for (i =0 ; i <16 ; ++i)
@@ -339,10 +335,8 @@ marvel_init_irq(void)/* Reserve the legacy irqs. */ for (i =0 ; i <16 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED ; - desc->chip = &marvel_legacy_irq_type; + irq_desc[i].status =IRQ_DISABLED ; + irq_desc[i].chip = &marvel_legacy_irq_type; }/* Init the io7 irqs. */
arch/alpha/kernel/sys_mikasa.c +3 -5
@@ -64,7 +64,7 @@ mikasa_startup_irq(unsigned int irq)static void mikasa_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))mikasa_enable_irq (irq); }
@@ -115,10 +115,8 @@ mikasa_init_irq(void)mikasa_update_irq_hw (0 );for (i =16 ; i <32 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &mikasa_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &mikasa_irq_type; }init_i8259a_irqs ();
arch/alpha/kernel/sys_noritake.c +3 -5
@@ -69,7 +69,7 @@ noritake_startup_irq(unsigned int irq)static void noritake_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))noritake_enable_irq (irq); }
@@ -144,10 +144,8 @@ noritake_init_irq(void)outw (0 ,0x54c );for (i =16 ; i <48 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &noritake_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &noritake_irq_type; }init_i8259a_irqs ();
arch/alpha/kernel/sys_rawhide.c +3 -5
@@ -131,7 +131,7 @@ rawhide_startup_irq(unsigned int irq)static void rawhide_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))rawhide_enable_irq (irq); }
@@ -194,10 +194,8 @@ rawhide_init_irq(void) }for (i =16 ; i <128 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &rawhide_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &rawhide_irq_type; }init_i8259a_irqs ();
arch/alpha/kernel/sys_rx164.c +3 -5
@@ -68,7 +68,7 @@ rx164_startup_irq(unsigned int irq)static void rx164_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))rx164_enable_irq (irq); }
@@ -116,10 +116,8 @@ rx164_init_irq(void)rx164_update_irq_hw (0 );for (i =16 ; i <40 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &rx164_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &rx164_irq_type; }init_i8259a_irqs ();
arch/alpha/kernel/sys_sable.c +3 -5
@@ -484,7 +484,7 @@ sable_lynx_startup_irq(unsigned int irq)static void sable_lynx_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))sable_lynx_enable_irq (irq); }
@@ -535,10 +535,8 @@ sable_lynx_init_irq(int nr_irqs)long i;for (i =0 ; i < nr_irqs; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &sable_lynx_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &sable_lynx_irq_type; }common_init_isa_dma ();
arch/alpha/kernel/sys_takara.c +3 -5
@@ -70,7 +70,7 @@ takara_startup_irq(unsigned int irq)static void takara_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))takara_enable_irq (irq); }
@@ -153,10 +153,8 @@ takara_init_irq(void)takara_update_irq_hw (i,-1 );for (i =16 ; i <128 ; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &takara_irq_type; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = &takara_irq_type; }common_init_isa_dma ();
arch/alpha/kernel/sys_titan.c +3 -5
@@ -139,7 +139,7 @@ titan_startup_irq(unsigned int irq)static void titan_end_irq (unsigned int irq) { -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))titan_enable_irq (irq); }
@@ -187,10 +187,8 @@ init_titan_irqs(struct hw_interrupt_type {long i;for (i = imin; i <= imax; ++i) { -struct irq_desc *desc =irq_desc (i); - - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = ops; + irq_desc[i].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i].chip = ops; } }
arch/alpha/kernel/sys_wildfire.c +8 -11
@@ -150,10 +150,10 @@ static void wildfire_end_irq(unsigned int irq) {#if 0 -if (!irq_desc (irq)->action) +if (!irq_desc[irq].action)printk ("got irq %d\n" , irq);#endif -if (!(irq_desc (irq)->status & (IRQ_DISABLED |IRQ_INPROGRESS ))) +if (!(irq_desc[irq].status & (IRQ_DISABLED |IRQ_INPROGRESS )))wildfire_enable_irq (irq); }
@@ -196,20 +196,17 @@ wildfire_init_irq_per_pca(int qbbno, int#endif for (i =0 ; i <16 ; ++i) { -struct irq_desc *desc;if (i ==2 )continue ; - desc =irq_desc (i+irq_bias); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &wildfire_irq_type; + irq_desc[i+irq_bias].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i+irq_bias].chip = &wildfire_irq_type; } -irq_desc (36 +irq_bias)->status =IRQ_DISABLED |IRQ_LEVEL ; -irq_desc (36 +irq_bias)->chip = &wildfire_irq_type; + irq_desc[36 +irq_bias].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[36 +irq_bias].chip = &wildfire_irq_type;for (i =40 ; i <64 ; ++i) { -struct irq_desc *desc =irq_desc (i+irq_bias); - desc->status =IRQ_DISABLED |IRQ_LEVEL ; - desc->chip = &wildfire_irq_type; + irq_desc[i+irq_bias].status =IRQ_DISABLED |IRQ_LEVEL ; + irq_desc[i+irq_bias].chip = &wildfire_irq_type; }setup_irq (32 +irq_bias, &isa_enable);
arch/arm/common/gic.c +1 -1
@@ -117,7 +117,7 @@ static void gic_set_cpu(unsigned int irqu32 val;spin_lock (&irq_controller_lock); -irq_desc (irq)->cpu = cpu; + irq_desc[irq].cpu = cpu; val =readl (reg) & ~(0xff << shift); val |=1 << (cpu + shift);writel (val, reg);
arch/arm/common/it8152.c +1 -1
@@ -70,7 +70,7 @@ static inline void it8152_irq(int irq) {struct irq_desc *desc; - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); }
arch/arm/common/locomo.c +8 -8
@@ -181,8 +181,8 @@ static void locomo_handler(unsigned intif (req) {/* generate the next interrupt(s) */ irq =LOCOMO_IRQ_START ; - d =irq_desc (irq); -for (i =0 ; i <=3 ; i++, irq++, d =irq_desc (irq)) { + d = irq_desc + irq; +for (i =0 ; i <=3 ; i++, d++, irq++) {if (req & (0x0100 << i)) {desc_handle_irq (irq, d); }
@@ -226,7 +226,7 @@ static void locomo_key_handler(unsignedvoid __iomem *mapbase =get_irq_chip_data (irq);if (locomo_readl (mapbase +LOCOMO_KEYBOARD +LOCOMO_KIC ) &0x0001 ) { - d =irq_desc (LOCOMO_IRQ_KEY_START ); + d = irq_desc +LOCOMO_IRQ_KEY_START ;desc_handle_irq (LOCOMO_IRQ_KEY_START , d); } }
@@ -277,8 +277,8 @@ static void locomo_gpio_handler(unsignedif (req) { irq =LOCOMO_IRQ_GPIO_START ; - d =irq_desc (LOCOMO_IRQ_GPIO_START ); -for (i =0 ; i <=15 ; i++, irq++, d =irq_desc (irq)) { + d = irq_desc +LOCOMO_IRQ_GPIO_START ; +for (i =0 ; i <=15 ; i++, irq++, d++) {if (req & (0x0001 << i)) {desc_handle_irq (irq, d); }
@@ -365,7 +365,7 @@ static void locomo_lt_handler(unsigned ivoid __iomem *mapbase =get_irq_chip_data (irq);if (locomo_readl (mapbase +LOCOMO_LTINT ) &0x0001 ) { - d =irq_desc (LOCOMO_IRQ_LT_START ); + d = irq_desc +LOCOMO_IRQ_LT_START ;desc_handle_irq (LOCOMO_IRQ_LT_START , d); } }
@@ -413,9 +413,9 @@ static void locomo_spi_handler(unsigned req =locomo_readl (mapbase +LOCOMO_SPI +LOCOMO_SPIIR ) &0x000F ;if (req) { irq =LOCOMO_IRQ_SPI_START ; - d =irq_desc (irq); + d = irq_desc + irq; -for (i =0 ; i <=3 ; i++, irq++, d =irq_desc (irq)) { +for (i =0 ; i <=3 ; i++, irq++, d++) {if (req & (0x0001 << i)) {desc_handle_irq (irq, d); }
arch/arm/common/sa1111.c +2 -2
@@ -170,11 +170,11 @@ sa1111_irq_handler(unsigned int irq, strfor (i =IRQ_SA1111_START ; stat0; i++, stat0 >>=1 )if (stat0 &1 ) -handle_edge_irq (i,irq_desc (i)); +handle_edge_irq (i, irq_desc + i);for (i =IRQ_SA1111_START +32 ; stat1; i++, stat1 >>=1 )if (stat1 &1 ) -handle_edge_irq (i,irq_desc (i)); +handle_edge_irq (i, irq_desc + i);/* For level-based interrupts */ desc->chip->unmask (irq);
arch/arm/kernel/ecard.c +2 -2
@@ -587,7 +587,7 @@ ecard_irq_handler(unsigned int irq, stru pending = ecard_default_ops.irqpending (ec);if (pending) { -struct irq_desc *d =irq_desc (ec->irq); +struct irq_desc *d = irq_desc + ec->irq;desc_handle_irq (ec->irq, d); called ++; }
@@ -622,7 +622,7 @@ ecard_irqexp_handler(unsigned int irq, secard_t *ec =slot_to_ecard (slot);if (ec->claimed) { -struct irq_desc *d =irq_desc (ec->irq); +struct irq_desc *d = irq_desc + ec->irq;/* * this ugly code is so that we can operate a * prioritorising system:
arch/arm/kernel/irq.c +4 -4
@@ -112,7 +112,7 @@ static struct irq_desc bad_irq_desc = { asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs); -struct irq_desc *desc =irq_desc (irq); +struct irq_desc *desc = irq_desc + irq;/* * Some hardware gives randomly wrong interrupts. Rather
@@ -142,7 +142,7 @@ void set_irq_flags(unsigned int irq, unsreturn ; } - desc =irq_desc (irq); + desc = irq_desc + irq;spin_lock_irqsave (&desc->lock, flags); desc->status |=IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;if (iflags &IRQF_VALID )
@@ -159,7 +159,7 @@ void __init init_IRQ(void)int irq;for (irq =0 ; irq <NR_IRQS ; irq++) -irq_desc (irq)->status |=IRQ_NOREQUEST |IRQ_NOPROBE ; + irq_desc[irq].status |=IRQ_NOREQUEST |IRQ_NOPROBE ;#ifdef CONFIG_SMP bad_irq_desc.affinity =CPU_MASK_ALL ;
@@ -189,7 +189,7 @@ void migrate_irqs(void)unsigned int i, cpu =smp_processor_id ();for (i =0 ; i <NR_IRQS ; i++) { -struct irq_desc *desc =irq_desc (i); +struct irq_desc *desc = irq_desc + i;if (desc->cpu == cpu) {unsigned int newcpu =any_online_cpu (desc->affinity);
arch/arm/mach-at91/gpio.c +2 -2
@@ -404,7 +404,7 @@ static void gpio_irq_handler(unsigned ir } pin = bank->chipbase; - gpio =irq_desc (pin); + gpio = &irq_desc[pin];while (isr) {if (isr &1 ) {
@@ -515,7 +515,7 @@ void __init at91_gpio_irq_setup(void)__raw_writel (~0 , this->regbase +PIO_IDR );for (i =0 , pin = this->chipbase; i <32 ; i++, pin++) { -lockdep_set_class (&irq_desc (pin)->lock, &gpio_lock_class); +lockdep_set_class (&irq_desc[pin].lock, &gpio_lock_class);/* * Can use the "simple" and not "edge" handler since it's
arch/arm/mach-davinci/gpio.c +5 -8
@@ -155,11 +155,10 @@ static void gpio_irq_enable(unsigned irq {struct gpio_controller *__iomem g =get_irq_chip_data (irq);u32 mask =__gpio_mask (irq_to_gpio (irq)); -struct irq_desc *desc =irq_desc (irq); -if (desc->status &IRQ_TYPE_EDGE_FALLING ) +if (irq_desc[irq].status &IRQ_TYPE_EDGE_FALLING )__raw_writel (mask, &g->set_falling); -if (desc->status &IRQ_TYPE_EDGE_RISING ) +if (irq_desc[irq].status &IRQ_TYPE_EDGE_RISING )__raw_writel (mask, &g->set_rising); }
@@ -167,14 +166,12 @@ static int gpio_irq_type(unsigned irq, u {struct gpio_controller *__iomem g =get_irq_chip_data (irq);u32 mask =__gpio_mask (irq_to_gpio (irq)); -struct irq_desc *desc;if (trigger & ~(IRQ_TYPE_EDGE_FALLING |IRQ_TYPE_EDGE_RISING ))return -EINVAL ; - desc =irq_desc (irq); - desc->status &= ~IRQ_TYPE_SENSE_MASK ; - desc->status |= trigger; + irq_desc[irq].status &= ~IRQ_TYPE_SENSE_MASK ; + irq_desc[irq].status |= trigger;__raw_writel (mask, (trigger &IRQ_TYPE_EDGE_FALLING ) ? &g->set_falling : &g->clr_falling);
@@ -218,7 +215,7 @@ gpio_irq_handler(unsigned irq, struct ir/* now demux them to the right lowlevel handler */ n = (int )get_irq_data (irq); - gpio =irq_desc (n); + gpio = &irq_desc[n];while (status) { res =ffs (status); n += res;
arch/arm/mach-ep93xx/core.c +6 -6
@@ -192,7 +192,7 @@ static void ep93xx_gpio_ab_irq_handler(ufor (i =0 ; i <8 ; i++) {if (status & (1 << i)) {int gpio_irq =gpio_to_irq (EP93XX_GPIO_LINE_A (0 )) + i; - desc =irq_desc (gpio_irq); + desc = irq_desc + gpio_irq;desc_handle_irq (gpio_irq, desc); } }
@@ -201,7 +201,7 @@ static void ep93xx_gpio_ab_irq_handler(ufor (i =0 ; i <8 ; i++) {if (status & (1 << i)) {int gpio_irq =gpio_to_irq (EP93XX_GPIO_LINE_B (0 )) + i; - desc =irq_desc (gpio_irq); + desc = irq_desc + gpio_irq;desc_handle_irq (gpio_irq, desc); } }
@@ -217,7 +217,7 @@ static void ep93xx_gpio_f_irq_handler(unint port_f_idx = ((irq +1 ) &7 ) ^4 ;/* {19..22,47..50} -> {0..7} */ int gpio_irq =gpio_to_irq (EP93XX_GPIO_LINE_F (0 )) + port_f_idx; -desc_handle_irq (gpio_irq,irq_desc (gpio_irq)); +desc_handle_irq (gpio_irq, irq_desc + gpio_irq); }static void ep93xx_gpio_irq_ack (unsigned int irq)
@@ -226,7 +226,7 @@ static void ep93xx_gpio_irq_ack(unsignedint port = line >>3 ;int port_mask =1 << (line &7 ); -if ((irq_desc (irq)->status &IRQ_TYPE_SENSE_MASK ) ==IRQ_TYPE_EDGE_BOTH ) { +if ((irq_desc[irq].status &IRQ_TYPE_SENSE_MASK ) ==IRQ_TYPE_EDGE_BOTH ) { gpio_int_type2[port] ^= port_mask;/* switch edge direction */ ep93xx_gpio_update_int_params (port); }
@@ -240,7 +240,7 @@ static void ep93xx_gpio_irq_mask_ack(unsint port = line >>3 ;int port_mask =1 << (line &7 ); -if ((irq_desc (irq)->status &IRQ_TYPE_SENSE_MASK ) ==IRQ_TYPE_EDGE_BOTH ) +if ((irq_desc[irq].status &IRQ_TYPE_SENSE_MASK ) ==IRQ_TYPE_EDGE_BOTH ) gpio_int_type2[port] ^= port_mask;/* switch edge direction */ gpio_int_unmasked[port] &= ~port_mask;
@@ -275,7 +275,7 @@ static void ep93xx_gpio_irq_unmask(unsig*/ static int ep93xx_gpio_irq_type (unsigned int irq,unsigned int type) { -struct irq_desc *desc =irq_desc (irq); +struct irq_desc *desc = irq_desc + irq;const int gpio =irq_to_gpio (irq);const int port = gpio >>3 ;const int port_mask =1 << (gpio &7 );
arch/arm/mach-footbridge/isa-irq.c +1 -1
@@ -94,7 +94,7 @@ isa_irq_handler(unsigned int irq, structreturn ; } - desc =irq_desc (isa_irq); + desc = irq_desc + isa_irq;desc_handle_irq (isa_irq, desc); }
arch/arm/mach-h720x/common.c +1 -1
@@ -104,7 +104,7 @@ h720x_gpio_handler(unsigned int mask, un struct irq_desc *desc) {IRQDBG ("%s irq: %d\n" , __func__, irq); - desc =irq_desc (irq); + desc = irq_desc + irq;while (mask) {if (mask &1 ) {IRQDBG ("handling irq %d\n" , irq);
arch/arm/mach-h720x/cpu-h7202.c +1 -1
@@ -120,7 +120,7 @@ h7202_timerx_demux_handler(unsigned int mask >>=1 ; irq =IRQ_TIMER1 ; - desc =irq_desc (irq); + desc = irq_desc + irq;while (mask) {if (mask &1 )desc_handle_irq (irq, desc);
arch/arm/mach-imx/irq.c +1 -1
@@ -182,7 +182,7 @@ static void imx_gpio_handler(unsigned int mask, unsigned int irq, struct irq_desc *desc) { - desc =irq_desc (irq); + desc = irq_desc + irq;while (mask) {if (mask &1 ) {DEBUG_IRQ ("handling irq %d\n" , irq);
arch/arm/mach-integrator/integrator_cp.c +1 -1
@@ -217,7 +217,7 @@ sic_handle_irq(unsigned int irq, struct irq +=IRQ_SIC_START ; - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); }while (status); }
arch/arm/mach-iop13xx/msi.c +1 -1
@@ -110,7 +110,7 @@ static void iop13xx_msi_handler(unsigneddo { j =find_first_bit (&status,32 ); (write_imipr[i])(1 << j);/* write back to clear bit */ - desc =irq_desc (IRQ_IOP13XX_MSI_0 + j + (32 *i)); + desc = irq_desc +IRQ_IOP13XX_MSI_0 + j + (32 *i);desc_handle_irq (IRQ_IOP13XX_MSI_0 + j + (32 *i), desc); status = (read_imipr[i])(); }while (status);
arch/arm/mach-ixp2000/core.c +2 -2
@@ -311,7 +311,7 @@ static void ixp2000_GPIO_irq_handler(unsfor (i =0 ; i <=7 ; i++) {if (status & (1 <<i)) { - desc =irq_desc (i +IRQ_IXP2000_GPIO0 ); + desc = irq_desc + i +IRQ_IXP2000_GPIO0 ;desc_handle_irq (i +IRQ_IXP2000_GPIO0 , desc); } }
@@ -404,7 +404,7 @@ static void ixp2000_err_irq_handler(unsifor (i =31 ; i >=0 ; i--) {if (status & (1 << i)) { - desc =irq_desc (IRQ_IXP2000_DRAM0_MIN_ERR + i); + desc = irq_desc +IRQ_IXP2000_DRAM0_MIN_ERR + i;desc_handle_irq (IRQ_IXP2000_DRAM0_MIN_ERR + i, desc); } }
arch/arm/mach-ixp2000/ixdp2x00.c +1 -1
@@ -131,7 +131,7 @@ static void ixdp2x00_irq_handler(unsigneif (ex_interrupt & (1 << i)) {struct irq_desc *cpld_desc;int cpld_irq =IXP2000_BOARD_IRQ (0 ) + i; - cpld_desc =irq_desc (cpld_irq); + cpld_desc = irq_desc + cpld_irq;desc_handle_irq (cpld_irq, cpld_desc); } }
arch/arm/mach-ixp2000/ixdp2x01.c +1 -1
@@ -81,7 +81,7 @@ static void ixdp2x01_irq_handler(unsigneif (ex_interrupt & (1 << i)) {struct irq_desc *cpld_desc;int cpld_irq =IXP2000_BOARD_IRQ (0 ) + i; - cpld_desc =irq_desc (cpld_irq); + cpld_desc = irq_desc + cpld_irq;desc_handle_irq (cpld_irq, cpld_desc); } }
arch/arm/mach-ixp23xx/core.c +1 -1
@@ -268,7 +268,7 @@ static void pci_handler(unsigned int irqBUG (); } - int_desc =irq_desc (irqno); + int_desc = irq_desc + irqno;desc_handle_irq (irqno, int_desc); desc->chip->unmask (irq);
arch/arm/mach-ixp23xx/ixdp2351.c +2 -2
@@ -71,7 +71,7 @@ static void ixdp2351_inta_handler(unsignstruct irq_desc *cpld_desc;int cpld_irq =IXP23XX_MACH_IRQ (IXDP2351_INTA_IRQ_BASE + i); - cpld_desc =irq_desc (cpld_irq); + cpld_desc = irq_desc + cpld_irq;desc_handle_irq (cpld_irq, cpld_desc); } }
@@ -108,7 +108,7 @@ static void ixdp2351_intb_handler(unsignstruct irq_desc *cpld_desc;int cpld_irq =IXP23XX_MACH_IRQ (IXDP2351_INTB_IRQ_BASE + i); - cpld_desc =irq_desc (cpld_irq); + cpld_desc = irq_desc + cpld_irq;desc_handle_irq (cpld_irq, cpld_desc); } }
arch/arm/mach-lh7a40x/common.h +1 -1
@@ -15,4 +15,4 @@ extern void lh7a404_init_irq (void);extern void lh7a40x_clcd_init (void );extern void lh7a40x_init_board_irq (void ); -#define IRQ_DISPATCH (irq) desc_handle_irq((irq),(irq_desc(irq))) +#define IRQ_DISPATCH (irq) desc_handle_irq((irq),(irq_desc + irq))
arch/arm/mach-netx/generic.c +1 -1
@@ -77,7 +77,7 @@ netx_hif_demux_handler(unsigned int irq_ stat = ((readl (NETX_DPMAS_INT_EN ) &readl (NETX_DPMAS_INT_STAT )) >>24 ) &0x1f ; - desc =irq_desc (NETX_IRQ_HIF_CHAINED (0 )); + desc = irq_desc +NETX_IRQ_HIF_CHAINED (0 );while (stat) {if (stat &1 ) {
arch/arm/mach-ns9xxx/board-a9m9750dev.c +1 -1
@@ -90,7 +90,7 @@ static void a9m9750dev_fpga_demux_handle stat &= ~(1 << irqno); - fpgadesc =irq_desc (FPGA_IRQ (irqno)); + fpgadesc = irq_desc +FPGA_IRQ (irqno);desc_handle_irq (FPGA_IRQ (irqno), fpgadesc); }
arch/arm/mach-omap1/fpga.c +1 -1
@@ -99,7 +99,7 @@ void innovator_fpga_IRQ_demux(unsigned i (fpga_irq <OMAP_FPGA_IRQ_END ) && stat; fpga_irq++, stat >>= 1) {if (stat &1 ) { - d =irq_desc (fpga_irq); + d = irq_desc + fpga_irq;desc_handle_irq (fpga_irq, d); } }
arch/arm/mach-orion5x/irq.c +6 -6
@@ -47,7 +47,7 @@static void orion5x_gpio_irq_ack (u32 irq) {int pin =irq_to_gpio (irq); -if (irq_desc (irq)->status &IRQ_LEVEL ) +if (irq_desc[irq].status &IRQ_LEVEL )/* * Mask bit for level interrupt */
@@ -62,7 +62,7 @@ static void orion5x_gpio_irq_ack(u32 irqstatic void orion5x_gpio_irq_mask (u32 irq) {int pin =irq_to_gpio (irq); -if (irq_desc (irq)->status &IRQ_LEVEL ) +if (irq_desc[irq].status &IRQ_LEVEL )orion5x_clrbits (GPIO_LEVEL_MASK ,1 << pin);else orion5x_clrbits (GPIO_EDGE_MASK ,1 << pin);
@@ -71,7 +71,7 @@ static void orion5x_gpio_irq_mask(u32 irstatic void orion5x_gpio_irq_unmask (u32 irq) {int pin =irq_to_gpio (irq); -if (irq_desc (irq)->status &IRQ_LEVEL ) +if (irq_desc[irq].status &IRQ_LEVEL )orion5x_setbits (GPIO_LEVEL_MASK ,1 << pin);else orion5x_setbits (GPIO_EDGE_MASK ,1 << pin);
@@ -88,7 +88,7 @@ static int orion5x_gpio_set_irq_type(u32return -EINVAL ; } - desc =irq_desc (irq); + desc = irq_desc + irq;switch (type) {case IRQ_TYPE_LEVEL_HIGH :
@@ -155,7 +155,7 @@ static void orion5x_gpio_irq_handler(unsfor (pin = offs; pin < offs +8 ; pin++) {if (cause & (1 << pin)) { irq =gpio_to_irq (pin); - desc =irq_desc (irq); + desc = irq_desc + irq;if ((desc->status &IRQ_TYPE_SENSE_MASK ) ==IRQ_TYPE_EDGE_BOTH ) {/* Swap polarity (race with GPIO line) */ u32 polarity =readl (GPIO_IN_POL );
@@ -186,7 +186,7 @@ static void __init orion5x_init_gpio_irqfor (i =IRQ_ORION5X_GPIO_START ; i <NR_IRQS ; i++) {set_irq_chip (i, &orion5x_gpio_irq_chip);set_irq_handler (i, handle_level_irq); - desc =irq_desc (i); + desc = irq_desc + i; desc->status |=IRQ_LEVEL ;set_irq_flags (i,IRQF_VALID ); }
arch/arm/mach-pxa/gpio.c +1 -1
@@ -275,7 +275,7 @@ static void pxa_gpio_demux_handler(unsig loop =1 ; n =PXA_GPIO_IRQ_BASE + bit; -desc_handle_irq (n,irq_desc (n)); +desc_handle_irq (n, irq_desc + n); bit =find_next_bit (gedr,GEDR_BITS , bit +1 ); }
arch/arm/mach-pxa/lpd270.c +1 -1
@@ -88,7 +88,7 @@ static void lpd270_irq_handler(unsignedGEDR (0 ) =GPIO_bit (0 );/* clear useless edge notification */ if (likely (pending)) { irq =LPD270_IRQ (0 ) +__ffs (pending); - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); pending = __raw_readw(LPD270_INT_STATUS) &
arch/arm/mach-pxa/lubbock.c +1 -1
@@ -131,7 +131,7 @@ static void lubbock_irq_handler(unsignedGEDR (0 ) =GPIO_bit (0 );/* clear our parent irq */ if (likely (pending)) { irq =LUBBOCK_IRQ (0 ) +__ffs (pending); - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); } pending =LUB_IRQ_SET_CLR & lubbock_irq_enabled;
arch/arm/mach-pxa/mainstone.c +1 -1
@@ -162,7 +162,7 @@ static void mainstone_irq_handler(unsignGEDR (0 ) =GPIO_bit (0 );/* clear useless edge notification */ if (likely (pending)) { irq =MAINSTONE_IRQ (0 ) +__ffs (pending); - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); } pending =MST_INTSETCLR & mainstone_irq_enabled;
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -262,7 +262,7 @@ static void pcm990_irq_handler(unsignedGPIO_bit (PCM990_CTRL_INT_IRQ_GPIO );if (likely (pending)) { irq =PCM027_IRQ (0 ) +__ffs (pending); - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); } pending = (~PCM990_INTSETCLR ) & pcm990_irq_enabled;
arch/arm/mach-s3c2410/bast-irq.c +3 -3
@@ -87,7 +87,7 @@ bast_pc104_mask(unsigned int irqno)static void bast_pc104_maskack (unsigned int irqno) { -struct irq_desc *desc =irq_desc (IRQ_ISA ); +struct irq_desc *desc = irq_desc +IRQ_ISA ;bast_pc104_mask (irqno); desc->chip->ack (IRQ_ISA );
@@ -122,7 +122,7 @@ bast_irq_pc104_demux(unsigned int irq,if (unlikely (stat ==0 )) {/* ack if we get an irq with nothing (ie, startup) */ - desc =irq_desc (IRQ_ISA ); + desc = irq_desc +IRQ_ISA ; desc->chip->ack (IRQ_ISA ); }else {/* handle the IRQ */
@@ -130,7 +130,7 @@ bast_irq_pc104_demux(unsigned int irq,for (i =0 ; stat !=0 ; i++, stat >>=1 ) {if (stat &1 ) { irqno = bast_pc104_irqs[i]; - desc =irq_desc (irqno); + desc = irq_desc + irqno;desc_handle_irq (irqno, desc); } }
arch/arm/mach-s3c2412/irq.c +2 -2
@@ -123,10 +123,10 @@ static void s3c2412_irq_demux_cfsdi(unsi subsrc &= ~submsk;if (subsrc &INTBIT (IRQ_S3C2412_SDI )) -desc_handle_irq (IRQ_S3C2412_SDI ,irq_desc (IRQ_S3C2412_SDI )); +desc_handle_irq (IRQ_S3C2412_SDI , irq_desc +IRQ_S3C2412_SDI );if (subsrc &INTBIT (IRQ_S3C2412_CF )) -desc_handle_irq (IRQ_S3C2412_CF ,irq_desc (IRQ_S3C2412_CF )); +desc_handle_irq (IRQ_S3C2412_CF , irq_desc +IRQ_S3C2412_CF ); }#define INTMSK_CFSDI (1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0))
arch/arm/mach-s3c2440/irq.c +2 -2
@@ -58,11 +58,11 @@ static void s3c_irq_demux_wdtac97(unsignif (subsrc !=0 ) {if (subsrc &1 ) { - mydesc =irq_desc (IRQ_S3C2440_WDT ); + mydesc = irq_desc +IRQ_S3C2440_WDT ;desc_handle_irq (IRQ_S3C2440_WDT , mydesc); }if (subsrc &2 ) { - mydesc =irq_desc (IRQ_S3C2440_AC97 ); + mydesc = irq_desc +IRQ_S3C2440_AC97 ;desc_handle_irq (IRQ_S3C2440_AC97 , mydesc); } }
arch/arm/mach-s3c2443/irq.c +2 -2
@@ -57,13 +57,13 @@ static inline void s3c2443_irq_demux(uns subsrc &= (1 << len)-1 ; end = len + irq; - mydesc =irq_desc (irq); + mydesc = irq_desc + irq;for (; irq < end && subsrc; irq++) {if (subsrc &1 )desc_handle_irq (irq, mydesc); - mydesc =irq_desc (irq); + mydesc++; subsrc >>=1 ; } }
arch/arm/mach-sa1100/h3600.c +6 -8
@@ -719,14 +719,14 @@ static void h3800_IRQ_demux(unsigned intif (0 )printk ("%s KPIO 0x%08X\n" , __func__, irq);for (j =0 ; j <H3800_KPIO_IRQ_COUNT ; j++)if (irq & kpio_irq_mask[j]) -handle_edge_irq (H3800_KPIO_IRQ_COUNT + j,irq_desc (H3800_KPIO_IRQ_COUNT + j)); +handle_edge_irq (H3800_KPIO_IRQ_COUNT + j, irq_desc +H3800_KPIO_IRQ_COUNT + j);/* GPIO2 */ irq =H3800_ASIC2_GPIINTFLAG ;if (0 )printk ("%s GPIO 0x%08X\n" , __func__, irq);for (j =0 ; j <H3800_GPIO_IRQ_COUNT ; j++)if (irq & gpio_irq_mask[j]) -handle_edge_irq (H3800_GPIO_IRQ_COUNT + j,irq_desc (H3800_GPIO_IRQ_COUNT + j)); +handle_edge_irq (H3800_GPIO_IRQ_COUNT + j, irq_desc +H3800_GPIO_IRQ_COUNT + j); }if (i >=MAX_ASIC_ISR_LOOPS )
@@ -822,17 +822,15 @@ static void __init h3800_init_irq(void)#if 0 for (i =0 ; i <H3800_KPIO_IRQ_COUNT ; i++) {int irq = i +H3800_KPIO_IRQ_START ; -struct irq_desc *desc =irq_desc (irq); - desc->valid =1 ; - desc->probe_ok =1 ; + irq_desc[irq].valid =1 ; + irq_desc[irq].probe_ok =1 ;set_irq_chip (irq, &h3800_kpio_irqchip); }for (i =0 ; i <H3800_GPIO_IRQ_COUNT ; i++) {int irq = i +H3800_GPIO_IRQ_START ; -struct irq_desc *desc =irq_desc (irq); - desc->valid =1 ; - desc->probe_ok =1 ; + irq_desc[irq].valid =1 ; + irq_desc[irq].probe_ok =1 ;set_irq_chip (irq, &h3800_gpio_irqchip); }#endif
arch/arm/mach-sa1100/irq.c +1 -1
@@ -122,7 +122,7 @@ sa1100_high_gpio_handler(unsigned int irGEDR = mask; irq =IRQ_GPIO11 ; - desc =irq_desc (irq); + desc = irq_desc + irq; mask >>=11 ; do { if (mask & 1)
arch/arm/mach-sa1100/neponset.c +3 -3
@@ -67,12 +67,12 @@ neponset_irq_handler(unsigned int irq, s desc->chip->ack (irq);if (irr &IRR_ETHERNET ) { - d =irq_desc (IRQ_NEPONSET_SMC9196 ); + d = irq_desc +IRQ_NEPONSET_SMC9196 ;desc_handle_irq (IRQ_NEPONSET_SMC9196 , d); }if (irr &IRR_USAR ) { - d =irq_desc (IRQ_NEPONSET_USAR ); + d = irq_desc +IRQ_NEPONSET_USAR ;desc_handle_irq (IRQ_NEPONSET_USAR , d); }
@@ -80,7 +80,7 @@ neponset_irq_handler(unsigned int irq, s }if (irr &IRR_SA1111 ) { - d =irq_desc (IRQ_NEPONSET_SA1111 ); + d = irq_desc +IRQ_NEPONSET_SA1111 ;desc_handle_irq (IRQ_NEPONSET_SA1111 , d); } }
arch/arm/mach-versatile/core.c +1 -1
@@ -95,7 +95,7 @@ sic_handle_irq(unsigned int irq, struct irq +=IRQ_SIC_START ; - desc =irq_desc (irq); + desc = irq_desc + irq;desc_handle_irq (irq, desc); }while (status); }
arch/arm/oprofile/op_model_mpcore.c +1 -1
@@ -259,7 +259,7 @@ static void em_stop(void)*/ static void em_route_irq (int irq,unsigned int cpu) { -struct irq_desc *desc =irq_desc (irq); +struct irq_desc *desc = irq_desc + irq;cpumask_t mask =cpumask_of_cpu (cpu);spin_lock_irq (&desc->lock);
arch/arm/plat-mxc/gpio.c +3 -4
@@ -105,14 +105,13 @@ static void mxc_gpio_irq_handler(struct gpio_irq_no = port->virtual_irq_start;for (; irq_stat !=0 ; irq_stat >>=1 , gpio_irq_no++) { -struct irq_desc *desc;if ((irq_stat &1 ) ==0 )continue ; - desc =irq_desc (gpio_irq_no); -BUG_ON (!(desc->handle_irq)); - desc->handle_irq (gpio_irq_no, desc); +BUG_ON (!(irq_desc[gpio_irq_no].handle_irq)); + irq_desc[gpio_irq_no].handle_irq (gpio_irq_no, + &irq_desc[gpio_irq_no]); } }
arch/arm/plat-omap/gpio.c +5 -7
@@ -648,10 +648,8 @@ static int gpio_irq_type(unsigned irq, uspin_lock_irqsave (&bank->lock, flags); retval =_set_gpio_triggering (bank,get_gpio_index (gpio), type);if (retval ==0 ) { -struct irq_desc *desc =irq_desc (irq); - - desc->status &= ~IRQ_TYPE_SENSE_MASK ; - desc->status |= type; + irq_desc[irq].status &= ~IRQ_TYPE_SENSE_MASK ; + irq_desc[irq].status |= type; }spin_unlock_irqrestore (&bank->lock, flags);
@@ -1057,7 +1055,7 @@ static void gpio_irq_handler(unsigned inif (!(isr &1 ))continue ; - d =irq_desc (gpio_irq); + d = irq_desc + gpio_irq;desc_handle_irq (gpio_irq, d); }
@@ -1505,7 +1503,7 @@ static int __init _omap_gpio_init(void)for (j = bank->virtual_irq_start; j < bank->virtual_irq_start + gpio_count; j++) { -lockdep_set_class (&irq_desc (j)->lock, &gpio_lock_class); +lockdep_set_class (&irq_desc[j].lock, &gpio_lock_class);set_irq_chip_data (j, bank);if (bank_is_mpuio (bank))set_irq_chip (j, &mpuio_irq_chip);
@@ -1820,7 +1818,7 @@ static int dbg_gpio_show(struct seq_file/* FIXME for at least omap2, show pullup/pulldown state */ - irqstat =irq_desc (irq)->status; + irqstat = irq_desc[irq].status;if (is_in && ((bank->suspend_wakeup & mask) || irqstat &IRQ_TYPE_SENSE_MASK )) {char *trigger =NULL ;
arch/arm/plat-orion/irq.c +1 -1
@@ -59,7 +59,7 @@ void __init orion_irq_init(unsigned intset_irq_chip (irq, &orion_irq_chip);set_irq_chip_data (irq, maskaddr);set_irq_handler (irq, handle_level_irq); -irq_desc (irq)->status |=IRQ_LEVEL ; + irq_desc[irq].status |=IRQ_LEVEL ;set_irq_flags (irq,IRQF_VALID ); } }
arch/arm/plat-s3c24xx/irq.c +7 -7
@@ -482,11 +482,11 @@ static void s3c_irq_demux_adc(unsigned iif (subsrc !=0 ) {if (subsrc &1 ) { - mydesc =irq_desc (IRQ_TC ); + mydesc = irq_desc +IRQ_TC ;desc_handle_irq (IRQ_TC , mydesc); }if (subsrc &2 ) { - mydesc =irq_desc (IRQ_ADC ); + mydesc = irq_desc +IRQ_ADC ;desc_handle_irq (IRQ_ADC , mydesc); } }
@@ -512,17 +512,17 @@ static void s3c_irq_demux_uart(unsigned subsrc &=7 ;if (subsrc !=0 ) { - desc =irq_desc (start); + desc = irq_desc + start;if (subsrc &1 )desc_handle_irq (start, desc); - desc =irq_desc (start +1 ); + desc++;if (subsrc &2 )desc_handle_irq (start+1 , desc); - desc =irq_desc (start +2 ); + desc++;if (subsrc &4 )desc_handle_irq (start+2 , desc);
@@ -572,7 +572,7 @@ s3c_irq_demux_extint8(unsigned int irq, eintpnd &= ~(1 <<irq); irq += (IRQ_EINT4 -4 ); -desc_handle_irq (irq,irq_desc (irq)); +desc_handle_irq (irq, irq_desc + irq); } }
@@ -595,7 +595,7 @@ s3c_irq_demux_extint4t7(unsigned int irq irq += (IRQ_EINT4 -4 ); -desc_handle_irq (irq,irq_desc (irq)); +desc_handle_irq (irq, irq_desc + irq); } }
arch/arm/plat-s3c24xx/s3c244x-irq.c +2 -2
@@ -58,11 +58,11 @@ static void s3c_irq_demux_cam(unsigned iif (subsrc !=0 ) {if (subsrc &1 ) { - mydesc =irq_desc (IRQ_S3C2440_CAM_C ); + mydesc = irq_desc +IRQ_S3C2440_CAM_C ;desc_handle_irq (IRQ_S3C2440_CAM_C , mydesc); }if (subsrc &2 ) { - mydesc =irq_desc (IRQ_S3C2440_CAM_P ); + mydesc = irq_desc +IRQ_S3C2440_CAM_P ;desc_handle_irq (IRQ_S3C2440_CAM_P , mydesc); } }
arch/avr32/mach-at32ap/extint.c +3 -4
@@ -88,6 +88,7 @@ static void eic_unmask_irq(unsigned intstatic int eic_set_irq_type (unsigned int irq,unsigned int flow_type) {struct eic *eic =get_irq_chip_data (irq); +struct irq_desc *desc;unsigned int i = irq - eic->first_irq;u32 mode, edge, level;int ret =0 ;
@@ -96,6 +97,8 @@ static int eic_set_irq_type(unsigned intif (flow_type ==IRQ_TYPE_NONE ) flow_type =IRQ_TYPE_LEVEL_LOW ; + desc = &irq_desc[irq]; + mode =eic_readl (eic,MODE ); edge =eic_readl (eic,EDGE ); level =eic_readl (eic,LEVEL );
@@ -123,10 +126,6 @@ static int eic_set_irq_type(unsigned int }if (ret ==0 ) { -struct irq_desc *desc; - - desc =irq_desc (irq); -eic_writel (eic,MODE , mode);eic_writel (eic,EDGE , edge);eic_writel (eic,LEVEL , level);
arch/avr32/mach-at32ap/intc.c +1 -1
@@ -69,7 +69,7 @@ asmlinkage void do_IRQ(int level, structirq_enter (); irq =intc_readl (&intc0,INTCAUSE0 -4 * level); - desc =irq_desc (irq); + desc = irq_desc + irq; desc->handle_irq (irq, desc);/*
arch/avr32/mach-at32ap/pio.c +1 -1
@@ -262,7 +262,7 @@ static void gpio_irq_handler(unsigned ir isr &= ~(1 << i); i += gpio_irq; - d =irq_desc (i); + d = &irq_desc[i]; d->handle_irq (i, d); }while (isr);
arch/blackfin/kernel/irqchip.c +5 -7
@@ -77,10 +77,8 @@ int show_interrupts(struct seq_file *p,unsigned long flags;if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto unlock;
@@ -91,7 +89,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }else if (i ==NR_IRQS ) {seq_printf (p,"Err: %10lu\n" , irq_err_count); }
@@ -110,7 +108,7 @@ __attribute__((l1_text)) asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) {struct pt_regs *old_regs; -struct irq_desc *desc =irq_desc (irq); +struct irq_desc *desc = irq_desc + irq;unsigned short pending, other_ints; old_regs =set_irq_regs (regs);
@@ -146,7 +144,7 @@ void __init init_IRQ(void)int irq;spin_lock_init (&irq_controller_lock); -for (irq =0 , desc =irq_desc (0 ); irq <NR_IRQS ; irq++, desc =irq_desc (irq)) { +for (irq =0 , desc = irq_desc; irq <NR_IRQS ; irq++, desc++) { *desc = bad_irq_desc; }
arch/blackfin/kernel/traps.c +3 -5
@@ -1003,10 +1003,8 @@ void show_regs(struct pt_regs *fp)/* if no interrupts are going off, don't print this out */ if (fp->ipend & ~0x3F ) {for (i =0 ; i < (NR_IRQS -1 ); i++) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto unlock;
@@ -1018,7 +1016,7 @@ void show_regs(struct pt_regs *fp) }printk ("\n" ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); } }
arch/blackfin/mach-bf537/boards/cm_bf537.c +1 -1
@@ -575,7 +575,7 @@ static int __init cm_bf537_init(void)#endif #if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) -irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ; + irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
@@ -1026,7 +1026,7 @@ static int __init stamp_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) -irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ; + irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ;#endif return 0 ;
arch/blackfin/mach-bf561/boards/cm_bf561.c +1 -1
@@ -411,7 +411,7 @@ static int __init cm_bf561_init(void)#endif #if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) -irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ; + irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-common/ints-priority.c +4 -4
@@ -315,7 +315,7 @@ static void bfin_demux_error_irq(unsigneif (irq) {if (error_int_mask & (1L << (irq -IRQ_PPI_ERROR ))) { -struct irq_desc *desc =irq_desc (irq); +struct irq_desc *desc = irq_desc + irq; desc->handle_irq (irq, desc); }else {
@@ -561,7 +561,7 @@ static void bfin_demux_gpio_irq(unsignedwhile (mask) {if (mask &1 ) { - desc =irq_desc (irq); + desc = irq_desc + irq; desc->handle_irq (irq, desc); } irq++;
@@ -576,7 +576,7 @@ static void bfin_demux_gpio_irq(unsigned do { if (mask & 1) { - desc = irq_desc(irq); + desc = irq_desc + irq; desc->handle_irq(irq, desc); } irq++;
@@ -928,7 +928,7 @@ static void bfin_demux_gpio_irq(unsignedwhile (request) {if (request &1 ) { irq = pint2irq_lut[pint_val] +SYS_IRQS ; - desc =irq_desc (irq); + desc = irq_desc + irq; desc->handle_irq (irq, desc); } pint_val++;
arch/cris/arch-v10/kernel/irq.c +1 -1
@@ -221,7 +221,7 @@ init_IRQ(void)/* Initialize IRQ handler descriptors. */ for (i =2 ; i <NR_IRQS ; i++) { -irq_desc (i)->chip = &crisv10_irq_type; + irq_desc[i].chip = &crisv10_irq_type;set_int_vector (i, interrupt[i]); }
arch/cris/arch-v32/kernel/irq.c +3 -3
@@ -475,15 +475,15 @@ init_IRQ(void)/* Point all IRQ's to bad handlers. */ for (i =FIRST_IRQ , j =0 ; j <NR_IRQS ; i++, j++) { -irq_desc (j)->chip = &crisv32_irq_type; + irq_desc[j].chip = &crisv32_irq_type;set_exception_vector (i, interrupt[j]); }/* Mark Timer and IPI IRQs as CPU local */ irq_allocations[TIMER0_INTR_VECT -FIRST_IRQ ].cpu =CPU_FIXED ; -irq_desc (TIMER0_INTR_VECT )->status |=IRQ_PER_CPU ; + irq_desc[TIMER0_INTR_VECT ].status |=IRQ_PER_CPU ; irq_allocations[IPI_INTR_VECT -FIRST_IRQ ].cpu =CPU_FIXED ; -irq_desc (IPI_INTR_VECT )->status |=IRQ_PER_CPU ; + irq_desc[IPI_INTR_VECT ].status |=IRQ_PER_CPU ;set_exception_vector (0x00 , nmi_interrupt);set_exception_vector (0x30 , multiple_interrupt);
arch/cris/kernel/irq.c +5 -7
@@ -57,10 +57,8 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto skip;seq_printf (p,"%3d: " ,i);
@@ -70,7 +68,7 @@ int show_interrupts(struct seq_file *p,for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , desc->chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)
@@ -78,7 +76,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); skip: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }return 0 ; }
@@ -101,7 +99,7 @@ asmlinkage void do_IRQ(int irq, struct pprintk ("do_IRQ: stack overflow: %lX\n" , sp);show_stack (NULL , (unsigned long *)sp); } -__do_IRQ (irq,irq_desc (irq)); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (old_regs); }
arch/frv/kernel/irq.c +4 -6
@@ -69,15 +69,13 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (action) {seq_printf (p,"%3d: " , i);for_each_present_cpu (cpu)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu)); -seq_printf (p," %10s" , desc->chip->name ? :"-" ); +seq_printf (p," %10s" , irq_desc[i].chip->name ? :"-" );seq_printf (p," %s" , action->name); for (action = action->next; action;
@@ -87,7 +85,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); } -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }else if (i ==NR_IRQS ) {seq_printf (p,"Err: %10u\n" ,atomic_read (&irq_err_count)); }
arch/h8300/kernel/irq.c +10 -14
@@ -166,19 +166,17 @@ void __init init_IRQ(void)setup_vector ();for (c =0 ; c <NR_IRQS ; c++) { -struct irq_desc *desc =irq_desc (c); - - desc->status =IRQ_DISABLED ; - desc->action =NULL ; - desc->depth =1 ; - desc->chip = &h8300irq_chip; + irq_desc[c].status =IRQ_DISABLED ; + irq_desc[c].action =NULL ; + irq_desc[c].depth =1 ; + irq_desc[c].chip = &h8300irq_chip; } } asmlinkage void do_IRQ(int irq) {irq_enter (); -__do_IRQ (irq,irq_desc (irq)); +__do_IRQ (irq, &irq_desc[irq]);irq_exit (); }
@@ -193,23 +191,21 @@ int show_interrupts(struct seq_file *p,seq_puts (p," CPU0" );if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto unlock;seq_printf (p,"%3d: " ,i);seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j)); -seq_printf (p," %14s" , desc->chip->name); -seq_printf (p,"-%-8s" , desc->name); +seq_printf (p," %14s" , irq_desc[i].chip->name); +seq_printf (p,"-%-8s" , irq_desc[i].name);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)seq_printf (p,", %s" , action->name);seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }return 0 ; }
arch/ia64/hp/sim/hpsim_irq.c +1 -1
@@ -44,7 +44,7 @@ hpsim_irq_init (void)int i;for (i =0 ; i <NR_IRQS ; ++i) { - idesc =irq_desc (i); + idesc = irq_desc + i;if (idesc->chip == &no_irq_type) idesc->chip = &irq_type_hp_sim; }
arch/ia64/include/asm/hw_irq.h +1 -1
@@ -146,7 +146,7 @@ static inline void ia64_native_resend_ir* Default implementations for the irq-descriptor API: */ -extern irq_desc_t irq_descX[NR_IRQS ]; +extern irq_desc_t irq_desc[NR_IRQS ];#ifndef CONFIG_IA64_GENERIC static inline ia64_vector __ia64_irq_to_vector (int irq)
arch/ia64/kernel/iosapic.c +8 -11
@@ -398,7 +398,7 @@ iosapic_end_level_irq (unsigned int irq)int do_unmask_irq =0 ;irq_complete_move (irq); -if (unlikely (irq_desc (irq)->status &IRQ_MOVE_PENDING )) { +if (unlikely (irq_desc[irq].status &IRQ_MOVE_PENDING )) { do_unmask_irq =1 ;mask_irq (irq); }
@@ -407,7 +407,7 @@ iosapic_end_level_irq (unsigned int irq)iosapic_eoi (rte->iosapic->addr, vec);if (unlikely (do_unmask_irq)) { -move_masked_irq (irq,irq_desc (irq)); +move_masked_irq (irq, &irq_desc[irq]);unmask_irq (irq); } }
@@ -449,7 +449,7 @@ iosapic_startup_edge_irq (unsigned int istatic void iosapic_ack_edge_irq (unsigned int irq) { -irq_desc_t *idesc =irq_desc (irq); +irq_desc_t *idesc = irq_desc + irq;irq_complete_move (irq);move_native_irq (irq, idesc);
@@ -646,7 +646,7 @@ register_intr (unsigned int gsi, int irq irq_type =iosapic_get_irq_chip (trigger); - idesc =irq_desc (irq); + idesc = irq_desc + irq;if (irq_type !=NULL && idesc->chip != irq_type) {if (idesc->chip != &no_irq_type) printk(KERN_WARNING
@@ -765,7 +765,6 @@ iosapic_register_intr (unsigned int gsi,struct iosapic_rte_info *rte;u32 low32;unsigned char dmode; -struct irq_desc *desc;/* * If this GSI has already been registered (i.e., it's a
@@ -793,14 +792,12 @@ iosapic_register_intr (unsigned int gsi, goto unlock_iosapic_lock; } - desc =irq_desc (irq); - -spin_lock (&desc->lock); +spin_lock (&irq_desc[irq].lock); dest =get_target_cpu (gsi, irq); dmode =choose_dmode (); err =register_intr (gsi, irq, dmode, polarity, trigger);if (err <0 ) { -spin_unlock (&desc->lock); +spin_unlock (&irq_desc[irq].lock); irq = err; goto unlock_iosapic_lock; }
@@ -819,7 +816,7 @@ iosapic_register_intr (unsigned int gsi, (polarity ==IOSAPIC_POL_HIGH ?"high" :"low" ), cpu_logical_id(dest), dest, irq_to_vector(irq)); -spin_unlock (&desc->lock); +spin_unlock (&irq_desc[irq].lock); unlock_iosapic_lock:spin_unlock_irqrestore (&iosapic_lock, flags);return irq;
@@ -860,7 +857,7 @@ iosapic_unregister_intr (unsigned int gsif (--rte->refcnt >0 ) goto out; - idesc =irq_desc (irq); + idesc = irq_desc + irq; rte->refcnt =NO_REF_RTE ;/* Mask the interrupt */
arch/ia64/kernel/irq.c +7 -9
@@ -71,10 +71,8 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto skip;seq_printf (p,"%3d: " ,i);
@@ -85,7 +83,7 @@ int show_interrupts(struct seq_file *p, seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); }#endif -seq_printf (p," %14s" , desc->chip->name); +seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)
@@ -93,7 +91,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); skip: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }else if (i ==NR_IRQS )seq_printf (p,"ERR: %10u\n" ,atomic_read (&irq_err_count));return 0 ;
@@ -109,7 +107,7 @@ void set_irq_affinity_info (unsigned intcpu_set (cpu_logical_id (hwid), mask);if (irq <NR_IRQS ) { -irq_desc (irq)->affinity = mask; + irq_desc[irq].affinity = mask; irq_redir[irq] = (char ) (redir &0xff ); } }
@@ -140,7 +138,7 @@ static void migrate_irqs(void)int irq, new_cpu;for (irq=0 ; irq <NR_IRQS ; irq++) { - desc =irq_desc (irq); + desc = irq_desc + irq;if (desc->status ==IRQ_DISABLED )continue ;
@@ -154,7 +152,7 @@ static void migrate_irqs(void)if (desc->status ==IRQ_PER_CPU )continue ; -cpus_and (mask, desc->affinity, cpu_online_map); +cpus_and (mask, irq_desc[irq].affinity, cpu_online_map);if (any_online_cpu (mask) ==NR_CPUS ) {/* * Save it for phase 2 processing
arch/ia64/kernel/irq_ia64.c +6 -6
@@ -343,7 +343,7 @@ static irqreturn_t smp_irq_move_cleanup_if (irq <0 )continue ; - desc =irq_desc (irq); + desc = irq_desc + irq; cfg = irq_cfg + irq;spin_lock (&desc->lock);if (!cfg->move_cleanup_count)
@@ -495,9 +495,9 @@ ia64_handle_irq (ia64_vector vector, strwhile (vector !=IA64_SPURIOUS_INT_VECTOR ) {if (unlikely (IS_LOCAL_TLB_FLUSH (vector))) {smp_local_flush_tlb (); -kstat_irqs_this_cpu (irq_desc (vector))++; +kstat_irqs_this_cpu (&irq_desc[vector])++; }else if (unlikely (IS_RESCHEDULE (vector))) -kstat_irqs_this_cpu (irq_desc (vector))++; +kstat_irqs_this_cpu (&irq_desc[vector])++;else {int irq =local_vector_to_irq (vector);
@@ -553,9 +553,9 @@ void ia64_process_pending_intr(void)while (vector !=IA64_SPURIOUS_INT_VECTOR ) {if (unlikely (IS_LOCAL_TLB_FLUSH (vector))) {smp_local_flush_tlb (); -kstat_irqs_this_cpu (irq_desc (vector))++; +kstat_irqs_this_cpu (&irq_desc[vector])++; }else if (unlikely (IS_RESCHEDULE (vector))) -kstat_irqs_this_cpu (irq_desc (vector))++; +kstat_irqs_this_cpu (&irq_desc[vector])++;else {struct pt_regs *old_regs =set_irq_regs (NULL );int irq =local_vector_to_irq (vector);
@@ -629,7 +629,7 @@ ia64_native_register_percpu_irq (ia64_ve irq = vec;BUG_ON (bind_irq_vector (irq, vec,CPU_MASK_ALL )); - desc =irq_desc (irq); + desc = irq_desc + irq; desc->status |=IRQ_PER_CPU ; desc->chip = &irq_type_ia64_lsapic;if (action)
arch/ia64/kernel/mca.c +1 -1
@@ -2101,7 +2101,7 @@ ia64_mca_late_init(void) irq =local_vector_to_irq (cpe_vector);if (irq >0 ) { cpe_poll_enabled =0 ; - desc =irq_desc (irq); + desc = irq_desc + irq; desc->status |=IRQ_PER_CPU ;setup_irq (irq, &mca_cpe_irqaction); ia64_cpe_irq = irq;
arch/ia64/kernel/msi_ia64.c +2 -2
@@ -73,7 +73,7 @@ static void ia64_set_msi_irq_affinity(un msg.data = data;write_msi_msg (irq, &msg); - irq_desc(irq)->affinity = cpumask_of_cpu(cpu); + irq_desc[irq].affinity = cpumask_of_cpu(cpu); }#endif /* CONFIG_SMP */
@@ -120,7 +120,7 @@ void ia64_teardown_msi_irq(unsigned intstatic void ia64_ack_msi_irq (unsigned int irq) {irq_complete_move (irq); -move_native_irq (irq,irq_desc (irq)); +move_native_irq (irq, &irq_desc[irq]);ia64_eoi (); }
arch/ia64/kernel/smpboot.c +1 -1
@@ -701,7 +701,7 @@ int migrate_platform_irqs(unsigned int c new_cpei_cpu =any_online_cpu (cpu_online_map); mask =cpumask_of_cpu (new_cpei_cpu);set_cpei_target_cpu (new_cpei_cpu); - desc =irq_desc (ia64_cpe_irq); + desc = irq_desc + ia64_cpe_irq;/* * Switch for now, immediately, we need to do fake intr * as other interrupts, but need to study CPEI behaviour with
arch/ia64/sn/kernel/irq.c +5 -6
@@ -110,7 +110,7 @@ static void sn_ack_irq(unsigned int irq)HUB_S ((u64 *)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED_ALIAS ), mask);__set_bit (irq, (volatile void *)pda->sn_in_service_ivecs); -move_native_irq (irq,irq_desc (irq)); +move_native_irq (irq, &irq_desc[irq]); }static void sn_end_irq (unsigned int irq)
@@ -293,15 +293,14 @@ unsigned int sn_local_vector_to_irq(u8 vvoid sn_irq_init (void ) {int i; -irq_desc_t *desc; +irq_desc_t *base_desc = irq_desc; ia64_first_device_vector =IA64_SN2_FIRST_DEVICE_VECTOR ; ia64_last_device_vector =IA64_SN2_LAST_DEVICE_VECTOR ;for (i =0 ; i <NR_IRQS ; i++) { - desc =irq_desc (i); -if (desc->chip == &no_irq_type) { - desc->chip = &irq_type_sn; +if (base_desc[i].chip == &no_irq_type) { + base_desc[i].chip = &irq_type_sn; } } }
@@ -430,7 +429,7 @@ sn_call_force_intr_provider(struct sn_ir pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type];/* Don't force an interrupt if the irq has been disabled */ -if (!(irq_desc (sn_irq_info->irq_irq)->status &IRQ_DISABLED ) && +if (!(irq_desc[sn_irq_info->irq_irq].status &IRQ_DISABLED ) && pci_provider && pci_provider->force_interrupt) (*pci_provider->force_interrupt)(sn_irq_info); }
arch/ia64/sn/kernel/msi_sn.c +2 -2
@@ -204,13 +204,13 @@ static void sn_set_msi_irq_affinity(unsi msg.address_lo = (u32)(bus_addr &0x00000000ffffffff );write_msi_msg (irq, &msg); - irq_desc(irq)->affinity = cpu_mask; + irq_desc[irq].affinity = cpu_mask; }#endif /* CONFIG_SMP */ static void sn_ack_msi_irq (unsigned int irq) { -move_native_irq (irq,irq_desc (irq)); +move_native_irq (irq, &irq_desc[irq]);ia64_eoi (); }
arch/m32r/kernel/irq.c +5 -7
@@ -43,10 +43,8 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto skip;seq_printf (p,"%3d: " ,i);
@@ -56,7 +54,7 @@ int show_interrupts(struct seq_file *p,for_each_online_cpu (j)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif -seq_printf (p," %14s" , desc->chip->typename); +seq_printf (p," %14s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);for (action=action->next; action; action = action->next)
@@ -64,7 +62,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); skip: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }else if (i ==NR_IRQS ) {seq_printf (p,"ERR: %10u\n" ,atomic_read (&irq_err_count));seq_printf (p,"MIS: %10u\n" ,atomic_read (&irq_mis_count));
@@ -86,7 +84,7 @@ asmlinkage unsigned int do_IRQ(int irq,#ifdef CONFIG_DEBUG_STACKOVERFLOW /* FIXME M32R */ #endif -__do_IRQ (irq,irq_desc (irq)); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (old_regs);
arch/m32r/platforms/m32104ut/setup.c +16 -21
@@ -77,7 +77,6 @@ static struct hw_interrupt_type m32104utvoid __init init_IRQ (void ) {static int once =0 ; -struct irq_desc *desc;if (once)return ;
@@ -86,40 +85,36 @@ void __init init_IRQ(void)#if defined(CONFIG_SMC91X )/* INT#0: LAN controller on M32104UT-LAN (SMC91C111)*/ - desc =irq_desc (M32R_IRQ_INT0 ); - desc->status =IRQ_DISABLED ; - desc->chip = &m32104ut_irq_type; - desc->action =0 ; - desc->depth =1 ; + irq_desc[M32R_IRQ_INT0 ].status =IRQ_DISABLED ; + irq_desc[M32R_IRQ_INT0 ].chip = &m32104ut_irq_type; + irq_desc[M32R_IRQ_INT0 ].action =0 ; + irq_desc[M32R_IRQ_INT0 ].depth =1 ; icu_data[M32R_IRQ_INT0 ].icucr =M32R_ICUCR_IEN |M32R_ICUCR_ISMOD11 ;/* "H" level sense */ disable_m32104ut_irq (M32R_IRQ_INT0 );#endif /* CONFIG_SMC91X */ /* MFT2 : system timer */ - desc =irq_desc (M32R_IRQ_MFT2 ); - desc->status =IRQ_DISABLED ; - desc->chip = &m32104ut_irq_type; - desc->action =0 ; - desc->depth =1 ; + irq_desc[M32R_IRQ_MFT2 ].status =IRQ_DISABLED ; + irq_desc[M32R_IRQ_MFT2 ].chip = &m32104ut_irq_type; + irq_desc[M32R_IRQ_MFT2 ].action =0 ; + irq_desc[M32R_IRQ_MFT2 ].depth =1 ; icu_data[M32R_IRQ_MFT2 ].icucr =M32R_ICUCR_IEN ;disable_m32104ut_irq (M32R_IRQ_MFT2 );#ifdef CONFIG_SERIAL_M32R_SIO /* SIO0_R : uart receive data */ - desc =irq_desc (M32R_IRQ_SIO0_R ); - desc->status =IRQ_DISABLED ; - desc->chip = &m32104ut_irq_type; - desc->action =0 ; - desc->depth =1 ; + irq_desc[M32R_IRQ_SIO0_R ].status =IRQ_DISABLED ; + irq_desc[M32R_IRQ_SIO0_R ].chip = &m32104ut_irq_type; + irq_desc[M32R_IRQ_SIO0_R ].action =0 ; + irq_desc[M32R_IRQ_SIO0_R ].depth =1 ; icu_data[M32R_IRQ_SIO0_R ].icucr =M32R_ICUCR_IEN ;disable_m32104ut_irq (M32R_IRQ_SIO0_R );/* SIO0_S : uart send data */ - desc =irq_desc (M32R_IRQ_SIO0_S ); - desc->status =IRQ_DISABLED ; - desc->chip = &m32104ut_irq_type; - desc->action =0 ; - desc->depth =1 ; + irq_desc[M32R_IRQ_SIO0_S ].status =IRQ_DISABLED ; + irq_desc[M32R_IRQ_SIO0_S ].chip = &m32104ut_irq_type; + irq_desc[M32R_IRQ_SIO0_S ].action =0 ; + irq_desc[M32R_IRQ_SIO0_S ].depth =1 ; icu_data[M32R_IRQ_SIO0_S ].icucr =M32R_ICUCR_IEN ;disable_m32104ut_irq (M32R_IRQ_SIO0_S );#endif /* CONFIG_SERIAL_M32R_SIO */
arch/m32r/platforms/m32700ut/setup.c +59 -74
200 lines not on this page · raw message
arch/m32r/platforms/mappi/setup.c +33 -51
134 lines not on this page · raw message
arch/m32r/platforms/mappi2/setup.c +40 -63
152 lines not on this page · raw message
arch/m32r/platforms/mappi3/setup.c +40 -63
154 lines not on this page · raw message
arch/m32r/platforms/oaks32r/setup.c +24 -38
96 lines not on this page · raw message
arch/m32r/platforms/opsput/setup.c +59 -90
221 lines not on this page · raw message
arch/m32r/platforms/usrv/setup.c +36 -56
129 lines not on this page · raw message
arch/mips/emma2rh/markeins/irq_markeins.c +1 -1
Lines of this file are not shown. View the raw message.
arch/mips/vr41xx/common/icu.c +22 -22
44 lines not on this page · raw message
arch/parisc/kernel/irq.c +18 -23
41 lines not on this page · raw message
arch/powerpc/platforms/8xx/m8xx_setup.c +1 -1
Lines of this file are not shown. View the raw message.
arch/powerpc/platforms/pseries/eeh_driver.c +1 -1
Lines of this file are not shown. View the raw message.
arch/sparc64/kernel/irq.c +19 -22
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 2/2] irq: rename irq_desc() to to_irq_desc()
Quoted 3 lines · Yinghai Lu
So could revert back to use irq_desc[] for other arch except x86
Signed-off-by Yinghai Lu <[email protected]>
great!
could we get rid of the remaining non-x86 arch changes too, please?
- __do_IRQ(): why is the change needed? Architectures that want to use sparse IRQs should first properly convert to genirq (i.e. should get rid of their __do_IRQ() use).
- kstat_cpu / kstat_irqs_cpu: seems unnecessary now?
- create_irq prototype return value change: cannot we limit the irq space to 0..INT_MAX, and leave the prototype alone?
- create_irq(int) argument change: how about introducing a new create_irq_nr(int) variant, while the create_irq(void) function would just call create_irq_nr(0) ?
Ingo
arch/alpha/kernel/irq.c +2 -2
@@ -89,7 +89,7 @@ show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (irq));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[irq]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (irq, j));#endif seq_printf (p," %14s" , irq_desc[irq].chip->typename); seq_printf(p, " %c%s",
@@ -156,6 +156,6 @@ handle_irq(int irq)* at IPL 0. */ local_irq_disable (); -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit (); }
arch/alpha/kernel/irq_alpha.c +1 -1
@@ -64,7 +64,7 @@ do_entInt(unsigned long type, unsigned long vector,smp_percpu_timer_interrupt (regs); cpu =smp_processor_id ();if (cpu != boot_cpuid) { -kstat_cpu (cpu).irqs[RTC_IRQ ]++; + irq_desc[RTC_IRQ ].kstat_irqs[cpu]++; }else {handle_irq (RTC_IRQ ); }
arch/arm/kernel/irq.c +7 -5
@@ -69,22 +69,24 @@ int show_interrupts(struct seq_file *p, void *v) }if (i <NR_IRQS ) { -spin_lock_irqsave (&irq_desc[i].lock, flags); - action = irq_desc[i].action; +struct irq_desc *desc =irq_desc (i); + +spin_lock_irqsave (&desc->lock, flags); + action = desc->action;if (!action) goto unlock;seq_printf (p,"%3d: " , i);for_each_present_cpu (cpu) -seq_printf (p,"%10u " ,kstat_cpu (cpu).irqs[i]); -seq_printf (p," %10s" , irq_desc[i].chip->name ? :"-" ); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu)); +seq_printf (p," %10s" , desc->chip->name ? :"-" );seq_printf (p," %s" , action->name);for (action = action->next; action; action = action->next)seq_printf (p,", %s" , action->name);seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&irq_desc[i].lock, flags); +spin_unlock_irqrestore (&desc->lock, flags); }else if (i ==NR_IRQS ) {#ifdef CONFIG_ARCH_ACORN show_fiq_list (p, v);
arch/arm/mach-iop13xx/msi.c +2 -2
@@ -125,7 +125,7 @@ void __init iop13xx_msi_init(void)/* * Dynamic irq allocate and deallocation */ -int create_irq (void ) +unsigned int create_irq (unsigned not_used) {int irq, pos;
@@ -173,7 +173,7 @@ static struct irq_chip iop13xx_msi_chip = {int arch_setup_msi_irq (struct pci_dev *pdev,struct msi_desc *desc) { -int id, irq =create_irq (); +int id, irq =create_irq (0 );struct msi_msg msg;if (irq <0 )
arch/arm/mach-ns9xxx/irq.c +1 -2
@@ -63,7 +63,6 @@ static struct irq_chip ns9xxx_chip = {#else static void handle_prio_irq (unsigned int irq,struct irq_desc *desc) { -unsigned int cpu =smp_processor_id ();struct irqaction *action;irqreturn_t action_ret;
@@ -72,7 +71,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)BUG_ON (desc->status &IRQ_INPROGRESS ); desc->status &= ~(IRQ_REPLAY |IRQ_WAITING ); -kstat_cpu (cpu).irqs[irq]++; +kstat_irqs_this_cpu (desc)++; action = desc->action;if (unlikely (!action || (desc->status &IRQ_DISABLED )))
arch/avr32/kernel/irq.c +7 -5
@@ -51,22 +51,24 @@ int show_interrupts(struct seq_file *p, void *v) }if (i <NR_IRQS ) { -spin_lock_irqsave (&irq_desc[i].lock, flags); - action = irq_desc[i].action; +struct irq_desc *desc =irq_desc (i); + +spin_lock_irqsave (&desc->lock, flags); + action = desc->action;if (!action) goto unlock;seq_printf (p,"%3d: " , i);for_each_online_cpu (cpu) -seq_printf (p,"%10u " ,kstat_cpu (cpu).irqs[i]); -seq_printf (p," %8s" , irq_desc[i].chip->name ? :"-" ); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu)); +seq_printf (p," %8s" , desc->chip->name ? :"-" );seq_printf (p," %s" , action->name);for (action = action->next; action; action = action->next)seq_printf (p,", %s" , action->name);seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&irq_desc[i].lock, flags); +spin_unlock_irqrestore (&desc->lock, flags); }return 0 ;
arch/blackfin/mach-bf527/boards/cm_bf527.c +1 -1
@@ -989,7 +989,7 @@ static int __init stamp_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf527/boards/ezkit.c +1 -1
@@ -1024,7 +1024,7 @@ static int __init stamp_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf533/boards/cm_bf533.c +1 -1
@@ -418,7 +418,7 @@ static int __init cm_bf533_init(void)#endif #if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf533/boards/ezkit.c +1 -1
@@ -426,7 +426,7 @@ static int __init ezkit_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf533/boards/stamp.c +1 -1
@@ -627,7 +627,7 @@ static int __init stamp_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf537/boards/generic_board.c +1 -1
@@ -733,7 +733,7 @@ static int __init stamp_init(void)#endif #if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/blackfin/mach-bf561/boards/ezkit.c +1 -1
@@ -540,7 +540,7 @@ static int __init ezkit_init(void)spi_register_board_info (bfin_spi_board_info,ARRAY_SIZE (bfin_spi_board_info));#if defined(CONFIG_PATA_PLATFORM ) || defined(CONFIG_PATA_PLATFORM_MODULE ) - irq_desc[PATA_INT ].status |=IRQ_NOAUTOEN ; +irq_desc (PATA_INT )->status |=IRQ_NOAUTOEN ;#endif return 0 ; }
arch/cris/kernel/irq.c +2 -2
@@ -66,7 +66,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif seq_printf (p," %14s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);
@@ -99,7 +99,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs)printk ("do_IRQ: stack overflow: %lX\n" , sp);show_stack (NULL , (unsigned long *)sp); } -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (old_regs); }
arch/frv/kernel/irq.c +1 -1
@@ -74,7 +74,7 @@ int show_interrupts(struct seq_file *p, void *v)if (action) {seq_printf (p,"%3d: " , i);for_each_present_cpu (cpu) -seq_printf (p,"%10u " ,kstat_cpu (cpu).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu));seq_printf (p," %10s" , irq_desc[i].chip->name ? :"-" );seq_printf (p," %s" , action->name); for (action = action->next;
arch/h8300/kernel/irq.c +2 -2
@@ -176,7 +176,7 @@ void __init init_IRQ(void) asmlinkage void do_IRQ(int irq) {irq_enter (); -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit (); }
@@ -196,7 +196,7 @@ int show_interrupts(struct seq_file *p, void *v)if (!action) goto unlock;seq_printf (p,"%3d: " ,i); -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p,"-%-8s" , irq_desc[i].name);seq_printf (p," %s" , action->name);
arch/ia64/kernel/iosapic.c +5 -5
@@ -407,7 +407,7 @@ iosapic_end_level_irq (unsigned int irq)iosapic_eoi (rte->iosapic->addr, vec);if (unlikely (do_unmask_irq)) { -move_masked_irq (irq); +move_masked_irq (irq, &irq_desc[irq]);unmask_irq (irq); } }
@@ -452,7 +452,7 @@ iosapic_ack_edge_irq (unsigned int irq)irq_desc_t *idesc = irq_desc + irq;irq_complete_move (irq); -move_native_irq (irq); +move_native_irq (irq, idesc);/* * Once we have recorded IRQ_PENDING already, we can mask the * interrupt for real. This prevents IRQ storms from unhandled
@@ -532,7 +532,7 @@ iosapic_reassign_vector (int irq)int new_irq;if (iosapic_intr_info[irq].count) { - new_irq =create_irq (); + new_irq =create_irq (0 );if (new_irq <0 )panic ("%s: out of interrupt vectors!\n" , __func__); printk(KERN_INFO "Reassigning vector %d to %d\n",
@@ -783,7 +783,7 @@ iosapic_register_intr (unsigned int gsi, goto unlock_iosapic_lock; } }else - irq =create_irq (); + irq =create_irq (0 );/* If vector is running out, we try to find a sharable vector */ if (irq <0 ) {
@@ -922,7 +922,7 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, delivery =IOSAPIC_PMI ;break ;case ACPI_INTERRUPT_INIT : - irq =create_irq (); + irq =create_irq (0 );if (irq <0 )panic ("%s: out of interrupt vectors!\n" , __func__); vector =irq_to_vector (irq);
arch/ia64/kernel/irq.c +1 -1
@@ -80,7 +80,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) { -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j)); }#endif seq_printf (p," %14s" , irq_desc[i].chip->name);
arch/ia64/kernel/irq_ia64.c +5 -5
@@ -403,7 +403,7 @@ void destroy_and_reserve_irq(unsigned int irq)/* * Dynamic irq allocate and deallocation for MSI */ -int create_irq (void ) +unsigned int create_irq (unsigned int not_used) {unsigned long flags;int irq, vector, cpu;
@@ -495,9 +495,9 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)while (vector !=IA64_SPURIOUS_INT_VECTOR ) {if (unlikely (IS_LOCAL_TLB_FLUSH (vector))) {smp_local_flush_tlb (); - kstat_this_cpu.irqs[vector]++; +kstat_irqs_this_cpu (&irq_desc[vector])++; }else if (unlikely (IS_RESCHEDULE (vector))) - kstat_this_cpu.irqs[vector]++; +kstat_irqs_this_cpu (&irq_desc[vector])++;else {int irq =local_vector_to_irq (vector);
@@ -553,9 +553,9 @@ void ia64_process_pending_intr(void)while (vector !=IA64_SPURIOUS_INT_VECTOR ) {if (unlikely (IS_LOCAL_TLB_FLUSH (vector))) {smp_local_flush_tlb (); - kstat_this_cpu.irqs[vector]++; +kstat_irqs_this_cpu (&irq_desc[vector])++; }else if (unlikely (IS_RESCHEDULE (vector))) - kstat_this_cpu.irqs[vector]++; +kstat_irqs_this_cpu (&irq_desc[vector])++;else {struct pt_regs *old_regs =set_irq_regs (NULL );int irq =local_vector_to_irq (vector);
arch/ia64/kernel/msi_ia64.c +2 -2
@@ -84,7 +84,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)int irq, vector;cpumask_t mask; - irq =create_irq (); + irq =create_irq (0 );if (irq <0 )return irq;
@@ -120,7 +120,7 @@ void ia64_teardown_msi_irq(unsigned int irq)static void ia64_ack_msi_irq (unsigned int irq) {irq_complete_move (irq); -move_native_irq (irq); +move_native_irq (irq, &irq_desc[irq]);ia64_eoi (); }
arch/ia64/sn/kernel/irq.c +1 -1
@@ -110,7 +110,7 @@ static void sn_ack_irq(unsigned int irq)HUB_S ((u64 *)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED_ALIAS ), mask);__set_bit (irq, (volatile void *)pda->sn_in_service_ivecs); -move_native_irq (irq); +move_native_irq (irq, &irq_desc[irq]); }static void sn_end_irq (unsigned int irq)
arch/ia64/sn/kernel/msi_sn.c +2 -2
@@ -83,7 +83,7 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)if (provider ==NULL || provider->dma_map_consistent ==NULL )return -EINVAL ; - irq =create_irq (); + irq =create_irq (0 );if (irq <0 )return irq;
@@ -210,7 +210,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask)static void sn_ack_msi_irq (unsigned int irq) { -move_native_irq (irq); +move_native_irq (irq, &irq_desc[irq]);ia64_eoi (); }
arch/m32r/kernel/irq.c +2 -2
@@ -52,7 +52,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif seq_printf (p," %14s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);
@@ -84,7 +84,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)#ifdef CONFIG_DEBUG_STACKOVERFLOW /* FIXME M32R */ #endif -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (old_regs);
arch/m68k/kernel/ints.c +2 -0
@@ -46,6 +46,8 @@#include <asm/q40ints.h> #endif +int nr_irqs =NR_IRQS ; +extern u32 auto_irqhandler_fixup[];extern u32 user_irqhandler_fixup[];extern u16 user_irqvec_fixup[];
arch/m68knommu/kernel/irq.c +1 -1
@@ -23,7 +23,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)struct pt_regs *oldregs =set_irq_regs (regs);irq_enter (); -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (oldregs);
arch/mips/kernel/irq.c +1 -1
@@ -108,7 +108,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p," %s" , action->name);
arch/mips/sgi-ip22/ip22-int.c +1 -1
@@ -164,7 +164,7 @@ static void indy_buserror_irq(void)int irq =SGI_BUSERR_IRQ ;irq_enter (); - kstat_this_cpu.irqs[irq]++; +kstat_irqs_this_cpu (&irq_desc[irq])++;ip22_be_interrupt (irq);irq_exit (); }
arch/mips/sgi-ip22/ip22-time.c +1 -1
@@ -186,7 +186,7 @@ void indy_8254timer_irq(void)char c;irq_enter (); - kstat_this_cpu.irqs[irq]++; +kstat_irqs_this_cpu (&irq_desc[irq])++;printk (KERN_ALERT "Oops, got 8254 interrupt.\n" );ArcRead (0 , &c,1 , &cnt);ArcEnterInteractiveMode ();
arch/mips/sibyte/bcm1480/smp.c +1 -1
@@ -180,7 +180,7 @@ void bcm1480_mailbox_interrupt(void)int cpu =smp_processor_id ();unsigned int action; - kstat_this_cpu.irqs[K_BCM1480_INT_MBOX_0_0 ]++; + irq_desc[K_BCM1480_INT_MBOX_0_0 ].kstat_irqs[cpu]++;/* Load the mailbox register to figure out what we're supposed to do */ action = (__raw_readq (mailbox_0_regs[cpu]) >>48 ) &0xffff ;
arch/mips/sibyte/sb1250/smp.c +1 -1
@@ -168,7 +168,7 @@ void sb1250_mailbox_interrupt(void)int cpu =smp_processor_id ();unsigned int action; - kstat_this_cpu.irqs[K_INT_MBOX_0 ]++; + irq_desc[K_INT_MBOX_0 ].kstat_irqs[cpu]++;/* Load the mailbox register to figure out what we're supposed to do */ action = (____raw_readq (mailbox_regs[cpu]) >>48 ) &0xffff ;
arch/mn10300/kernel/irq.c +1 -2
@@ -197,12 +197,11 @@ int show_interrupts(struct seq_file *p, void *v)/* display information rows, one per active CPU */ case 1 ... NR_IRQS - 1:spin_lock_irqsave (&irq_desc[i].lock, flags); - action = irq_desc[i].action;if (action) {seq_printf (p,"%3d: " , i);for_each_present_cpu (cpu) -seq_printf (p,"%10u " ,kstat_cpu (cpu).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu));seq_printf (p," %14s.%u" , irq_desc[i].chip->name, (GxICR (i) & GxICR_LEVEL) >> GxICR_LEVEL_SHIFT);
arch/parisc/kernel/irq.c +2 -2
@@ -183,7 +183,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%3d: " , i);#ifdef CONFIG_SMP for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#else seq_printf (p,"%10u " ,kstat_irqs (i));#endif
@@ -363,7 +363,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) goto set_out; }#endif -__do_IRQ (irq); +__do_IRQ (irq, irq_desc); out:irq_exit ();
arch/powerpc/kernel/irq.c +1 -1
@@ -190,7 +190,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%3d: " , i);#ifdef CONFIG_SMP for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#else seq_printf (p,"%10u " ,kstat_irqs (i));#endif /* CONFIG_SMP */
arch/powerpc/platforms/cell/interrupt.c +1 -1
@@ -254,7 +254,7 @@ static void handle_iic_irq(unsigned int irq, struct irq_desc *desc) goto out_eoi; } -kstat_cpu (cpu).irqs[irq]++; +kstat_irqs_this_cpu (desc)++;/* Mark the IRQ currently in progress.*/ desc->status |=IRQ_INPROGRESS ;
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -221,7 +221,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)continue ; irq +=__ilog2 (bits);spin_unlock_irqrestore (&pmac_pic_lock, flags); -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);spin_lock_irqsave (&pmac_pic_lock, flags); rc =IRQ_HANDLED ; }
arch/s390/kernel/irq.c +2 -0
@@ -17,6 +17,8 @@#include <linux/proc_fs.h> #include <linux/profile.h> +int nr_irqs =NR_IRQS ; +/* * show_interrupts is needed by /proc/interrupts. */
arch/sh/kernel/irq.c +1 -1
@@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v) goto unlock;seq_printf (p,"%3d: " ,i);for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));seq_printf (p," %14s" , irq_desc[i].chip->name);seq_printf (p,"-%-8s" , irq_desc[i].name);seq_printf (p," %s" , action->name);
arch/sparc/kernel/irq.c +3 -0
@@ -55,6 +55,9 @@#define SMP_NOP2 #define SMP_NOP3 #endif /* SMP */ + +int nr_irqs =NR_IRQS ; +unsigned long __raw_local_irq_save (void ) {unsigned long retval;
arch/sparc64/kernel/irq.c +1 -1
@@ -185,7 +185,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif seq_printf (p," %9s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);
arch/sparc64/kernel/time.c +2 -1
@@ -16,6 +16,7 @@#include <linux/param.h> #include <linux/string.h> #include <linux/mm.h> +#include <linux/irq.h> #include <linux/interrupt.h> #include <linux/time.h> #include <linux/timex.h>
@@ -942,7 +943,7 @@ void timer_interrupt(int irq, struct pt_regs *regs)irq_enter (); - kstat_this_cpu.irqs[0 ]++; + irq_desc[0 ].kstat_irqs[0 ]++;if (unlikely (!evt->event_handler)) { printk(KERN_WARNING
arch/um/kernel/irq.c +2 -2
@@ -42,7 +42,7 @@ int show_interrupts(struct seq_file *p, void *v)seq_printf (p,"%10u " ,kstat_irqs (i));#else for_each_online_cpu (j) -seq_printf (p,"%10u " ,kstat_cpu (j).irqs[i]); +seq_printf (p,"%10u " ,kstat_irqs_cpu (i, j));#endif seq_printf (p," %14s" , irq_desc[i].chip->typename);seq_printf (p," %s" , action->name);
@@ -332,7 +332,7 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs ((struct pt_regs *)regs);irq_enter (); -__do_IRQ (irq); +__do_IRQ (irq, &irq_desc[irq]);irq_exit ();set_irq_regs (old_regs);return 1 ;
Re: [PATCH 2/2] irq: rename irq_desc() to to_irq_desc()
Quoted 7 lines · Ingo Molnar
Quoted 3 lines · Yinghai Lu
So could revert back to use irq_desc[] for other arch except x86
Signed-off-by Yinghai Lu <[email protected]>
Quoted 7 lines
great!
could we get rid of the remaining non-x86 arch changes too, please?
-
__do_IRQ(): why is the change needed? Architectures that want to use sparse IRQs should first properly convert to genirq (i.e. should get rid of their__do_IRQ()use).
please check attacch patch
Quoted 2 lines
-
kstat_cpu/kstat_irqs_cpu: seems unnecessary now?
that is needed
Quoted 7 lines
-
create_irqprototype return value change: cannot we limit the irq space to 0..INT_MAX, and leave the prototype alone?-
create_irq(int)argument change: how about introducing a newcreate_irq_nr(int)variant, while thecreate_irq(void)function would just callcreate_irq_nr(0)?
will send out another patch later
YH
[PATCH] irq: rename irq_desc() to to_irq_desc() - fix
some left overs.
--- arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 10 ++++------ arch/avr32/kernel/irq.c | 8 +++----- arch/cris/kernel/irq.c | 2 +- arch/h8300/kernel/irq.c | 2 +- arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/msi_ia64.c | 2 +- arch/ia64/sn/kernel/irq.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/m32r/kernel/irq.c | 2 +- arch/m68knommu/kernel/irq.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/um/kernel/irq.c | 2 +- arch/x86/kernel/io_apic.c | 4 +--- drivers/parisc/dino.c | 3 +-- drivers/parisc/eisa.c | 4 +--- drivers/parisc/gsc.c | 3 +-- drivers/parisc/superio.c | 4 +--- drivers/xen/events.c | 2 +- include/linux/irq.h | 10 +++++----- kernel/irq/handle.c | 3 ++- kernel/irq/migration.c | 4 +++- 23 files changed, 35 insertions(+), 44 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -156,6 +156,6 @@ handle_irq(int irq)* at IPL 0. */ local_irq_disable (); -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit (); }
arch/arm/kernel/irq.c +4 -6
@@ -69,24 +69,22 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto unlock;seq_printf (p,"%3d: " , i);for_each_present_cpu (cpu)seq_printf (p,"%10u " ,kstat_irqs_cpu (i, cpu)); -seq_printf (p," %10s" , desc->chip->name ? :"-" ); +seq_printf (p," %10s" , irq_desc[i].chip->name ? :"-" );seq_printf (p," %s" , action->name);for (action = action->next; action; action = action->next)seq_printf (p,", %s" , action->name);seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }else if (i ==NR_IRQS ) {#ifdef CONFIG_ARCH_ACORN show_fiq_list (p, v);
arch/avr32/kernel/irq.c +3 -5
@@ -51,10 +51,8 @@ int show_interrupts(struct seq_file *p, }if (i <NR_IRQS ) { -struct irq_desc *desc =irq_desc (i); - -spin_lock_irqsave (&desc->lock, flags); - action = desc->action; +spin_lock_irqsave (&irq_desc[i].lock, flags); + action = irq_desc[i].action;if (!action) goto unlock;
@@ -68,7 +66,7 @@ int show_interrupts(struct seq_file *p,seq_putc (p,'\n' ); unlock: -spin_unlock_irqrestore (&desc->lock, flags); +spin_unlock_irqrestore (&irq_desc[i].lock, flags); }return 0 ;
arch/cris/kernel/irq.c +1 -1
@@ -99,7 +99,7 @@ asmlinkage void do_IRQ(int irq, struct pprintk ("do_IRQ: stack overflow: %lX\n" , sp);show_stack (NULL , (unsigned long *)sp); } -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit ();set_irq_regs (old_regs); }
arch/h8300/kernel/irq.c +1 -1
@@ -176,7 +176,7 @@ void __init init_IRQ(void) asmlinkage void do_IRQ(int irq) {irq_enter (); -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit (); }
arch/ia64/kernel/iosapic.c +1 -1
@@ -452,7 +452,7 @@ iosapic_ack_edge_irq (unsigned int irq)irq_desc_t *idesc = irq_desc + irq;irq_complete_move (irq); -move_native_irq (irq, idesc); +move_native_irq (irq);/* * Once we have recorded IRQ_PENDING already, we can mask the * interrupt for real. This prevents IRQ storms from unhandled
arch/ia64/kernel/msi_ia64.c +1 -1
@@ -120,7 +120,7 @@ void ia64_teardown_msi_irq(unsigned intstatic void ia64_ack_msi_irq (unsigned int irq) {irq_complete_move (irq); -move_native_irq (irq, &irq_desc[irq]); +move_native_irq (irq);ia64_eoi (); }
arch/ia64/sn/kernel/irq.c +1 -1
@@ -110,7 +110,7 @@ static void sn_ack_irq(unsigned int irq)HUB_S ((u64 *)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED_ALIAS ), mask);__set_bit (irq, (volatile void *)pda->sn_in_service_ivecs); -move_native_irq (irq, &irq_desc[irq]); +move_native_irq (irq); }static void sn_end_irq (unsigned int irq)
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -210,7 +210,7 @@ static void sn_set_msi_irq_affinity(unsistatic void sn_ack_msi_irq (unsigned int irq) { -move_native_irq (irq, &irq_desc[irq]); +move_native_irq (irq);ia64_eoi (); }
arch/m32r/kernel/irq.c +1 -1
@@ -84,7 +84,7 @@ asmlinkage unsigned int do_IRQ(int irq,#ifdef CONFIG_DEBUG_STACKOVERFLOW /* FIXME M32R */ #endif -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit ();set_irq_regs (old_regs);
arch/m68knommu/kernel/irq.c +1 -1
@@ -23,7 +23,7 @@ asmlinkage void do_IRQ(int irq, struct pstruct pt_regs *oldregs =set_irq_regs (regs);irq_enter (); -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit ();set_irq_regs (oldregs);
arch/parisc/kernel/irq.c +1 -1
@@ -363,7 +363,7 @@ void do_cpu_irq_mask(struct pt_regs *reg goto set_out; }#endif -__do_IRQ (irq, irq_desc); +__do_IRQ (irq); out:irq_exit ();
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -221,7 +221,7 @@ static irqreturn_t gatwick_action(int cpcontinue ; irq +=__ilog2 (bits);spin_unlock_irqrestore (&pmac_pic_lock, flags); -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);spin_lock_irqsave (&pmac_pic_lock, flags); rc =IRQ_HANDLED ; }
arch/um/kernel/irq.c +1 -1
@@ -332,7 +332,7 @@ unsigned int do_IRQ(int irq, struct uml_ {struct pt_regs *old_regs =set_irq_regs ((struct pt_regs *)regs);irq_enter (); -__do_IRQ (irq, &irq_desc[irq]); +__do_IRQ (irq);irq_exit ();set_irq_regs (old_regs);return 1 ;
drivers/parisc/dino.c +1 -2
@@ -389,10 +389,9 @@ ilr_again:do {int local_irq =__ffs (mask);int irq = dino_dev->global_irq[local_irq]; -struct irq_desc *desc =to_irq_desc (irq);DBG (KERN_DEBUG "%s(%d, %p) mask 0x%x\n" , __func__, irq, intr_dev, mask); -__do_IRQ (irq, desc); +__do_IRQ (irq); mask &= ~(1 << local_irq); }while (mask);
drivers/parisc/eisa.c +1 -3
@@ -202,7 +202,6 @@ static irqreturn_t eisa_irq(int wax_irq, {int irq =gsc_readb (0xfc01f000 );/* EISA supports 16 irqs */ unsigned long flags; -struct irq_desc *desc;spin_lock_irqsave (&eisa_irq_lock, flags);/* read IRR command */
@@ -234,8 +233,7 @@ static irqreturn_t eisa_irq(int wax_irq, }spin_unlock_irqrestore (&eisa_irq_lock, flags); - desc =to_irq_desc (irq); -__do_IRQ (irq, desc); +__do_IRQ (irq);spin_lock_irqsave (&eisa_irq_lock, flags);/* unmask */
drivers/parisc/gsc.c +1 -2
@@ -87,8 +87,7 @@ irqreturn_t gsc_asic_intr(int gsc_asic_ido {int local_irq =__ffs (irr);unsigned int irq = gsc_asic->global_irq[local_irq]; -struct irq_desc *desc =to_irq_desc (irq); -__do_IRQ (irq, desc); +__do_IRQ (irq); irr &= ~(1 << local_irq); }while (irr);
drivers/parisc/superio.c +1 -3
@@ -99,7 +99,6 @@ superio_interrupt(int parent_irq, void * {u8 results;u8 local_irq; -struct irq_desc *desc;/* Poll the 8259 to see if there's an interrupt. */ outb (OCW3_POLL ,IC_PIC1 +0 );
@@ -140,8 +139,7 @@ superio_interrupt(int parent_irq, void * }/* Call the appropriate device's interrupt */ - desc =to_irq_desc (local_irq); -__do_IRQ (local_irq, desc); +__do_IRQ (local_irq);/* set EOI - forces a new interrupt if a lower priority device * still needs service.
drivers/xen/events.c +1 -1
@@ -640,7 +640,7 @@ static void ack_dynirq(unsigned int irq) {int evtchn =evtchn_from_irq (irq); -move_native_irq (irq,to_irq_desc (irq)); +move_native_irq (irq);if (VALID_EVTCHN (evtchn))clear_evtchn (evtchn);
include/linux/irq.h +5 -5
@@ -244,7 +244,7 @@ extern int setup_irq(unsigned int irq, s#ifdef CONFIG_GENERIC_PENDING_IRQ void set_pending_irq (unsigned int irq,cpumask_t mask); -void move_native_irq (int irq,struct irq_desc *desc); +void move_native_irq (int irq);void move_masked_irq (int irq,struct irq_desc *desc);#else /* CONFIG_GENERIC_PENDING_IRQ */
@@ -253,7 +253,7 @@ static inline void move_irq(int irq) { } -static inline void move_native_irq (int irq,struct irq_desc *desc) +static inline void move_native_irq (int irq) { }
@@ -269,7 +269,7 @@ static inline void set_pending_irq(unsig#else /* CONFIG_SMP */ -#define move_native_irq (x, y) +#define move_native_irq (x)#define move_masked_irq (x, y)#endif /* CONFIG_SMP */
@@ -302,7 +302,7 @@ extern void handle_bad_irq(unsigned int* Monolithic do_IRQ implementation. */ #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ -extern unsigned int __do_IRQ (unsigned int irq,struct irq_desc *desc); +extern unsigned int __do_IRQ (unsigned int irq);#endif /*
@@ -319,7 +319,7 @@ static inline void generic_handle_irq_deif (likely (desc->handle_irq)) desc->handle_irq (irq, desc);else -__do_IRQ (irq, desc); +__do_IRQ (irq);#endif }
kernel/irq/handle.c +2 -1
@@ -385,10 +385,11 @@ irqreturn_t handle_IRQ_event(unsigned in* This is the original x86 implementation which is used for every * interrupt type. */ -unsigned int __do_IRQ (unsigned int irq,struct irq_desc *desc) +unsigned int __do_IRQ (unsigned int irq) {struct irqaction *action;unsigned int status; +struct irq_desc *desc =to_irq_desc (irq);kstat_irqs_this_cpu (desc)++;if (CHECK_IRQ_PER_CPU (desc->status)) {
kernel/irq/migration.c +3 -1
@@ -57,8 +57,10 @@ void move_masked_irq(int irq, struct irqcpus_clear (desc->pending_mask); } -void move_native_irq (int irq,struct irq_desc *desc) +void move_native_irq (int irq) { +struct irq_desc *desc =to_irq_desc (irq); +if (likely (!(desc->status &IRQ_MOVE_PENDING )))return ;
arch/x86/kernel/io_apic.c +1 -3
@@ -2426,10 +2426,8 @@ static void ack_x2apic_edge(unsigned intstatic void ack_apic_edge (unsigned int irq) { -struct irq_desc *desc =to_irq_desc (irq); -irq_complete_move (irq); -move_native_irq (irq, desc); +move_native_irq (irq);ack_APIC_irq (); }
Ingo Molnar
AppliedQuoted 1 line · Yinghai Lu
Signed-off-by Yinghai Lu <[email protected]>
applied to tip/x86/apic, thanks.
Ingo