Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0efeaa335ce494680d1884f267eed7642dee3ca8
Commit: 0efeaa335ce494680d1884f267eed7642dee3ca8
Parent: fefa864530766d8da2b8606235387c5173fb2309
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 9 23:17:51 2008 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 9 23:17:51 2008 -0800
pppol2tp: fix printk warnings
drivers/net/pppol2tp.c: In function `pppol2tp_seq_tunnel_show':
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 4)
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 5)
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 6)
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 7)
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 8)
drivers/net/pppol2tp.c:2295: warning: long long unsigned int format, __u64
arg (arg 9)
drivers/net/pppol2tp.c: In function `pppol2tp_seq_session_show':
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 5)
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 6)
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 7)
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 8)
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 9)
drivers/net/pppol2tp.c:2328: warning: long long unsigned int format, __u64
arg (arg 10)
Not all platforms implement u64 with unsigned long long. eg: powerpc.
Cc: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
drivers/net/pppol2tp.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 5aa0a80..e0b072d 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2289,10 +2289,12 @@ static void pppol2tp_seq_tunnel_show(struct seq_file
*m, void *v)
atomic_read(&tunnel->ref_count) - 1);
seq_printf(m, " %08x %llu/%llu/%llu %llu/%llu/%llu\n",
tunnel->debug,
- tunnel->stats.tx_packets, tunnel->stats.tx_bytes,
- tunnel->stats.tx_errors,
- tunnel->stats.rx_packets, tunnel->stats.rx_bytes,
- tunnel->stats.rx_errors);
+ (unsigned long long)tunnel->stats.tx_packets,
+ (unsigned long long)tunnel->stats.tx_bytes,
+ (unsigned long long)tunnel->stats.tx_errors,
+ (unsigned long long)tunnel->stats.rx_packets,
+ (unsigned long long)tunnel->stats.rx_bytes,
+ (unsigned long long)tunnel->stats.rx_errors);
}
static void pppol2tp_seq_session_show(struct seq_file *m, void *v)
@@ -2320,12 +2322,12 @@ static void pppol2tp_seq_session_show(struct seq_file
*m, void *v)
jiffies_to_msecs(session->reorder_timeout));
seq_printf(m, " %hu/%hu %llu/%llu/%llu %llu/%llu/%llu\n",
session->nr, session->ns,
- session->stats.tx_packets,
- session->stats.tx_bytes,
- session->stats.tx_errors,
- session->stats.rx_packets,
- session->stats.rx_bytes,
- session->stats.rx_errors);
+ (unsigned long long)session->stats.tx_packets,
+ (unsigned long long)session->stats.tx_bytes,
+ (unsigned long long)session->stats.tx_errors,
+ (unsigned long long)session->stats.rx_packets,
+ (unsigned long long)session->stats.rx_bytes,
+ (unsigned long long)session->stats.rx_errors);
}
static int pppol2tp_seq_show(struct seq_file *m, void *v)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
