[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt



Dixi quod…

>This one does work:
>http://lists.debian.org/debian-kernel/2011/12/msg00474.html

Geert, would you please apply the attached patch, independent of
whether we are able to find a solution in aufs, as it avoids an
entire problem class?

Groeten uit Duitsland,
//mirabilos
-- 
[...] if maybe ext3fs wasn't a better pick, or jfs, or maybe reiserfs, oh but
what about xfs, and if only i had waited until reiser4 was ready... in the be-
ginning, there was ffs, and in the middle, there was ffs, and at the end, there
was still ffs, and the sys admins knew it was good. :)  -- Ted Unangst über *fs
From fda2529371f8cc8879877ca3f3eb9dfbaafb9755 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 31 Dec 2011 22:48:52 +0000
Subject: [PATCH] replace inline ack_bad_irq with a block macro to avoid error
 propagation

If any file including (directly or indirectly) hardirq.h redefines
pr_fmt to something containing some value not available at hardirq
inclusion time, defining a static inline function fails, whereas a
macro can always be defined (and need not even be expanded once in
the translation unit with pr_fmt redefined while all static inline
functions will always be expanded).

Fixes: http://lists.debian.org/debian-kernel/2011/12/msg00474.html

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 arch/m68k/include/asm/hardirq.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
index db30ed2..a2e00e7 100644
--- a/arch/m68k/include/asm/hardirq.h
+++ b/arch/m68k/include/asm/hardirq.h
@@ -18,10 +18,10 @@
 
 #ifdef CONFIG_MMU
 
-static inline void ack_bad_irq(unsigned int irq)
-{
-	pr_crit("unexpected IRQ trap at vector %02x\n", irq);
-}
+#define ack_bad_irq(irq) do {					\
+	pr_crit("unexpected IRQ trap at vector %02x\n",		\
+	    (unsigned int)(irq));				\
+} while (/* CONSTCOND */ 0)
 
 /* entry.S is sensitive to the offsets of these fields */
 typedef struct {
-- 
1.7.7.3


Reply to: