diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 10:00:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-25 10:00:21 -0700 |
| commit | 44c471e43698d966d2bf291a9631f7d22a861bbd (patch) | |
| tree | de669164743bdfb4bfe9d0b06e48465d50660dd1 | |
| parent | f47edb59bb4897a5d495139bb12e93cd3f0cbded (diff) | |
| parent | d0ff14fdc987303aeeb7de6f1bd72c3749ae2a9b (diff) | |
| download | linux-44c471e43698d966d2bf291a9631f7d22a861bbd.tar.gz linux-44c471e43698d966d2bf291a9631f7d22a861bbd.tar.bz2 linux-44c471e43698d966d2bf291a9631f7d22a861bbd.zip | |
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()
| -rw-r--r-- | kernel/irq/irqdesc.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 9484e88dabc2..9be995fc3c5a 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -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); /* |