From: "Linus Lüssing" <linus.luessing@web.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: use original printk in bat_printk
Date: Wed, 10 Feb 2010 03:36:41 +0100 [thread overview]
Message-ID: <20100210023641.GA2112@Linus-Debian> (raw)
In-Reply-To: <20100208213212.GA9389@Sellars>
bat_printk is calling a printk which got previously
substituted because of the define in compat.h.
This patch removes the define for the scope of
bat_printk.c.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
diff --git a/batman-adv-kernelland/bat_printk.c b/batman-adv-kernelland/bat_printk.c
index a55eff3..556620a 100644
--- a/batman-adv-kernelland/bat_printk.c
+++ b/batman-adv-kernelland/bat_printk.c
@@ -35,6 +35,13 @@
/* Works only for digits and letters, but small and fast */
#define TOLOWER(x) ((x) | 0x20)
+/* We don't want to recursively call bat_printk here
+ because of the previous define in compat.h */
+#ifdef printk
+#define ___printk printk
+#undef printk
+#endif
+
static int skip_atoi(const char **s)
{
int i = 0;
@@ -853,3 +860,8 @@ asmlinkage int bat_printk(const char *fmt, ...)
return printk("foo:%s", buf);
}
+
+#ifdef ___printk
+#define printk ___printk
+#undef ___printk
+#endif
next prev parent reply other threads:[~2010-02-10 2:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-08 20:56 [B.A.T.M.A.N.] Can't load batman-module on 2.6.26 Linus Lüssing
2010-02-08 21:32 ` Linus Lüssing
2010-02-10 2:36 ` Linus Lüssing [this message]
2010-02-10 10:47 ` [B.A.T.M.A.N.] [PATCH] batman-adv: use original printk in bat_printk Marek Lindner
2010-02-10 13:11 ` Andrew Lunn
2010-02-10 15:08 ` [B.A.T.M.A.N.] [PATCH 1/2] " Linus Lüssing
2010-02-10 15:08 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: remove "foo" from bat_printk strings Linus Lüssing
2010-02-13 16:02 ` Marek Lindner
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=20100210023641.GA2112@Linus-Debian \
--to=linus.luessing@web.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.