Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44c471e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq fix from Thomas Gleixner:
 "A single fix for a imbalanced kobject operation in the irq decriptor
  code which was unearthed by the new warnings in the kobject code"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Properly pair kobject_del() with kobject_add()
parents f47edb59 d0ff14fd

kernel/irq/irqdesc.c

+14 −1
Original line number Diff line number Diff line
@@ -295,6 +295,18 @@ static void irq_sysfs_add(int irq, struct irq_desc *desc) 
	}

}



static void irq_sysfs_del(struct irq_desc *desc)

{

	/*

	 * If irq_sysfs_init() has not yet been invoked (early boot), then

	 * irq_kobj_base is NULL and the descriptor was never added.

	 * kobject_del() complains about a object with no parent, so make

	 * it conditional.

	 */

	if (irq_kobj_base)

		kobject_del(&desc->kobj);

}



static int __init irq_sysfs_init(void)

{

	struct irq_desc *desc;
@@ -325,6 +337,7 @@ static struct kobj_type irq_kobj_type = { 
};



static void irq_sysfs_add(int irq, struct irq_desc *desc) {}

static void irq_sysfs_del(struct irq_desc *desc) {}



#endif /* CONFIG_SYSFS */
@@ -438,7 +451,7 @@ static void free_desc(unsigned int irq) 
	 * The sysfs entry must be serialized against a concurrent

	 * irq_sysfs_init() as well.

	 */

	kobject_del(&desc->kobj);

	irq_sysfs_del(desc);

	delete_irq_desc(irq);



	/*