From: Andrew Morton <akpm@linux-foundation•org>
To: KOSAKI Motohiro <kosaki.motohiro@jp•fujitsu.com>
Cc: Yinghai Lu <yhlu.kernel@gmail•com>, Ingo Molnar <mingo@elte•hu>,
LKML <linux-kernel@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>
Subject: Re: [mmotm and linux-next][PATCH] irq: enclose irq_desc_lock_class in CONFIG_LOCKDEP
Date: Tue, 16 Dec 2008 00:34:28 -0800 [thread overview]
Message-ID: <20081216003428.43d37b6b.akpm@linux-foundation.org> (raw)
In-Reply-To: <20081216170635.DBB8.KOSAKI.MOTOHIRO@jp.fujitsu.com>
On Tue, 16 Dec 2008 17:08:43 +0900 (JST) KOSAKI Motohiro <kosaki.motohiro@jp•fujitsu.com> wrote:
>
>
> Applied after: linux-next.patch
>
> ==
> Subject: [mmotm][PATCH] irq: enclose irq_desc_lock_class in CONFIG_LOCKDEP
>
> commit 08678b0841267c1d00d771fe01548d86043d065e introduced
> irq_desc_lock_class variable.
> But it is used only if CONFIG_LOCKDEP=Y.
> otherwise, following warnings happend.
>
> CC kernel/irq/handle.o
> kernel/irq/handle.c:26: warning: 'irq_desc_lock_class' defined but not used
>
>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp•fujitsu.com>
> CC: Yinghai Lu <yhlu.kernel@gmail•com>
> CC: Ingo Molnar <mingo@elte•hu>
> ---
> kernel/irq/handle.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> Index: b/kernel/irq/handle.c
> ===================================================================
> --- a/kernel/irq/handle.c
> +++ b/kernel/irq/handle.c
> @@ -20,10 +20,12 @@
>
> #include "internals.h"
>
> +#ifdef CONFIG_LOCKDEP
> /*
> * lockdep: we want to handle all irq_desc locks as a single lock-class:
> */
> static struct lock_class_key irq_desc_lock_class;
> +#endif
>
> /**
> * handle_bad_irq - handle spurious and unhandled irqs
>
No, lockdep.h (which we forgot to include) already handles that:
# define lockdep_set_class(lock, key) do { (void)(key); } while (0)
the problem is that the code which references irq_desc_lock_class is
inside #ifdef CONFIG_SPARSE_IRQ, so this is a better fix:
--- a/kernel/irq/handle.c~irq-enclose-irq_desc_lock_class-in-config_lockdep
+++ a/kernel/irq/handle.c
@@ -13,6 +13,7 @@
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/random.h>
+#include <linux/lockdep.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/rculist.h>
@@ -20,11 +21,6 @@
#include "internals.h"
-/*
- * lockdep: we want to handle all irq_desc locks as a single lock-class:
- */
-static struct lock_class_key irq_desc_lock_class;
-
/**
* handle_bad_irq - handle spurious and unhandled irqs
* @irq: the interrupt number
@@ -61,6 +57,12 @@ void __init __attribute__((weak)) arch_e
}
#ifdef CONFIG_SPARSE_IRQ
+
+/*
+ * lockdep: we want to handle all irq_desc locks as a single lock-class:
+ */
+static struct lock_class_key irq_desc_lock_class;
+
static struct irq_desc irq_desc_init = {
.irq = -1,
.status = IRQ_DISABLED,
_
next prev parent reply other threads:[~2008-12-16 8:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-16 8:08 [mmotm and linux-next][PATCH] irq: enclose irq_desc_lock_class in CONFIG_LOCKDEP KOSAKI Motohiro
2008-12-16 8:34 ` Andrew Morton [this message]
2008-12-16 10:18 ` Ingo Molnar
2008-12-16 10:23 ` Ingo Molnar
2008-12-16 11:15 ` KOSAKI Motohiro
2008-12-16 11:20 ` Ingo Molnar
2008-12-16 11:45 ` KOSAKI Motohiro
2008-12-16 12:18 ` Ingo Molnar
2008-12-16 12:58 ` KOSAKI Motohiro
2008-12-17 10:40 ` KOSAKI Motohiro
2008-12-18 13:36 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081216003428.43d37b6b.akpm@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=kosaki.motohiro@jp$(echo .)fujitsu.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=yhlu.kernel@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox