The following commit has been merged in the master branch: commit f678bc9883bb28d9d20db01bc0de53efbacc21c5 Author: Sven Eckelmann sven@narfation.org Date: Sat May 14 23:14:47 2011 +0200
batman-adv: Print jiffies as unsigned long
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c index 4577d3f..e8491ee 100644 --- a/net/batman-adv/bat_debugfs.c +++ b/net/batman-adv/bat_debugfs.c @@ -82,7 +82,7 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...)
va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - fdebug_log(bat_priv->debug_log, "[%10u] %s", + fdebug_log(bat_priv->debug_log, "[%10lu] %s", (jiffies / HZ), tmp_log_buf); va_end(args);
linux-merge@lists.open-mesh.org