Author: marek
Date: 2010-02-13 15:55:55 +0100 (Sat, 13 Feb 2010)
New Revision: 1569
Modified:
trunk/batman-adv-kernelland/bat_printk.c
Log:
batman-adv: fix endless recursion in bat_printk()
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?\195?\188ssing <linus.luessing(a)web.de>
Signed-off-by: Andrew Lunn <andrew(a)lunn.ch>
Modified: trunk/batman-adv-kernelland/bat_printk.c
===================================================================
--- trunk/batman-adv-kernelland/bat_printk.c 2010-01-26 03:45:37 UTC (rev 1568)
+++ trunk/batman-adv-kernelland/bat_printk.c 2010-02-13 14:55:55 UTC (rev 1569)
@@ -35,6 +35,12 @@
/* 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
+#undef printk
+#endif
+
static int skip_atoi(const char **s)
{
int i = 0;
