tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Ingo Molnar:
"A resume_irq() fix, plus a number of static declaration fixes"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/digicolor: Drop unnecessary static
irqchip/mips-cpu: Drop unnecessary static
irqchip/gic/realview: Drop unnecessary static
irqchip/mips-gic: Remove population of irq domain names
genirq/PM: Properly pretend disabled state when force resuming interrupts

Linus Torvalds 34eddefe 0a6109fd

+15 -15
+1 -1
drivers/irqchip/irq-digicolor.c
··· 71 71 static int __init digicolor_of_init(struct device_node *node, 72 72 struct device_node *parent) 73 73 { 74 - static void __iomem *reg_base; 74 + void __iomem *reg_base; 75 75 unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; 76 76 struct regmap *ucregs; 77 77 int ret;
+1 -1
drivers/irqchip/irq-gic-realview.c
··· 43 43 static int __init 44 44 realview_gic_of_init(struct device_node *node, struct device_node *parent) 45 45 { 46 - static struct regmap *map; 46 + struct regmap *map; 47 47 struct device_node *np; 48 48 const struct of_device_id *gic_id; 49 49 u32 pld1_ctrl;
+1 -1
drivers/irqchip/irq-mips-cpu.c
··· 154 154 static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq, 155 155 irq_hw_number_t hw) 156 156 { 157 - static struct irq_chip *chip; 157 + struct irq_chip *chip; 158 158 159 159 if (hw < 2 && cpu_has_mipsmt) { 160 160 /* Software interrupts are used for MT/CMT IPI */
-2
drivers/irqchip/irq-mips-gic.c
··· 950 950 &gic_irq_domain_ops, NULL); 951 951 if (!gic_irq_domain) 952 952 panic("Failed to add GIC IRQ domain"); 953 - gic_irq_domain->name = "mips-gic-irq"; 954 953 955 954 gic_ipi_domain = irq_domain_add_hierarchy(gic_irq_domain, 956 955 IRQ_DOMAIN_FLAG_IPI_PER_CPU, ··· 958 959 if (!gic_ipi_domain) 959 960 panic("Failed to add GIC IPI domain"); 960 961 961 - gic_ipi_domain->name = "mips-gic-ipi"; 962 962 irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI); 963 963 964 964 if (node &&
-10
kernel/irq/chip.c
··· 170 170 irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED); 171 171 } 172 172 173 - static void irq_state_set_disabled(struct irq_desc *desc) 174 - { 175 - irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); 176 - } 177 - 178 173 static void irq_state_clr_masked(struct irq_desc *desc) 179 174 { 180 175 irqd_clear(&desc->irq_data, IRQD_IRQ_MASKED); 181 - } 182 - 183 - static void irq_state_set_masked(struct irq_desc *desc) 184 - { 185 - irqd_set(&desc->irq_data, IRQD_IRQ_MASKED); 186 176 } 187 177 188 178 static void irq_state_clr_started(struct irq_desc *desc)
+10
kernel/irq/internals.h
··· 227 227 return __irqd_to_state(d) & mask; 228 228 } 229 229 230 + static inline void irq_state_set_disabled(struct irq_desc *desc) 231 + { 232 + irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); 233 + } 234 + 235 + static inline void irq_state_set_masked(struct irq_desc *desc) 236 + { 237 + irqd_set(&desc->irq_data, IRQD_IRQ_MASKED); 238 + } 239 + 230 240 #undef __irqd_to_state 231 241 232 242 static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)
+2
kernel/irq/pm.c
··· 149 149 150 150 /* Pretend that it got disabled ! */ 151 151 desc->depth++; 152 + irq_state_set_disabled(desc); 153 + irq_state_set_masked(desc); 152 154 resume: 153 155 desc->istate &= ~IRQS_SUSPENDED; 154 156 __enable_irq(desc);