[PATCH] sparseirq: set lock_class for legacy irq when sparse_irq is selected

[PATCH] sparseirq: set lock_class for legacy irq when sparse_irq is selected

[Yinghai Lu]

Impact: fix

that is used to call init_one_irq_desc, after we use static one directly, that line
need to be duplicated too.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 kernel/irq/handle.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/kernel/irq/handle.c
===================================================================
--- linux-2.6.orig/kernel/irq/handle.c
+++ linux-2.6/kernel/irq/handle.c
@@ -146,6 +146,7 @@ void __init early_irq_init(void)
 	for (i = 0; i < legacy_count; i++) {
 		desc[i].irq = i;
 		desc[i].kstat_irqs = kstat_irqs_legacy[i];
+		lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
 
 		irq_desc_ptrs[i] = desc + i;
 	}

Re: [PATCH] sparseirq: set lock_class for legacy irq when sparse_irq is selected

[Ingo Molnar]

* Yinghai Lu <yinghai@kernel.org> wrote:

> 
> Impact: fix
> 
> that is used to call init_one_irq_desc, after we use static one 
> directly, that line need to be duplicated too.
> 
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>

applied to tip/irq/sparseirq, thanks Yinghai. I updated the changelog to 
the one below.

	Ingo

----------------->
>From 46f2e2de343fa15374fa95e3b1f1d53443803b48 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 22 Dec 2008 20:24:09 -0800
Subject: [PATCH] sparseirq: set lock_class for legacy irq when sparse_irq is selected

Impact: add lockdep annotation to legacy IRQ descs

Warnings resulting out of this were not seen in practice, but it's prudent
to initialize the legacy descriptors to the lock class as well, symmetric
to how we do it with other descriptors.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/irq/handle.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 1a01f91..157c04c 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -145,6 +145,7 @@ int __init early_irq_init(void)
 	for (i = 0; i < legacy_count; i++) {
 		desc[i].irq = i;
 		desc[i].kstat_irqs = kstat_irqs_legacy[i];
+		lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
 
 		irq_desc_ptrs[i] = desc + i;
 	}