Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1761f7d7fea32c2290710f5c0afa0c3d93220593
Commit:     1761f7d7fea32c2290710f5c0afa0c3d93220593
Parent:     fddc2feb94c1f734dc27d44d166e97ab2e005ec1
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Tue Mar 20 15:04:30 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:26:57 2007 -0700

    [CCID3]: Remove build warnings for 64bit
    
    This clears the following sparc64 build warnings:
     1) warning: format "%ld" expects type "long int", but argument 3 has type 
"suseconds_t"
     2) warning: format "%llu" expects type "long long unsigned int", but 
argument 3 has type "__u64"
    Fixed by using typecast to unsigned. This is argued to be safe, since the 
quantities, after
    de-scaling (factor 2^6) fit all in u32.
    
    Signed-off-by: Gerrit Renker <[EMAIL PROTECTED]>
    Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/dccp/ccids/ccid3.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 95eca99..dc6e418 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -94,9 +94,9 @@ static inline void ccid3_update_send_interval(struct 
ccid3_hc_tx_sock *hctx)
        hctx->ccid3hctx_delta = min_t(u32, hctx->ccid3hctx_t_ipi / 2,
                                           TFRC_OPSYS_HALF_TIME_GRAN);
 
-       ccid3_pr_debug("t_ipi=%u, delta=%u, s=%u, X=%llu\n",
+       ccid3_pr_debug("t_ipi=%u, delta=%u, s=%u, X=%u\n",
                       hctx->ccid3hctx_t_ipi, hctx->ccid3hctx_delta,
-                      hctx->ccid3hctx_s, hctx->ccid3hctx_x >> 6);
+                      hctx->ccid3hctx_s, (unsigned)(hctx->ccid3hctx_x >> 6));
 
 }
 /*
@@ -139,9 +139,11 @@ static void ccid3_hc_tx_update_x(struct sock *sk, struct 
timeval *now)
        }
 
        if (hctx->ccid3hctx_x != old_x) {
-               ccid3_pr_debug("X_prev=%llu, X_now=%llu, X_calc=%u, "
-                              "X_recv=%llu\n", old_x >> 6, hctx->ccid3hctx_x 
>> 6,
-                              hctx->ccid3hctx_x_calc, hctx->ccid3hctx_x_recv 
>> 6);
+               ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "
+                              "X_recv=%u\n", (unsigned)(old_x >> 6),
+                              (unsigned)(hctx->ccid3hctx_x >> 6),
+                              hctx->ccid3hctx_x_calc,
+                              (unsigned)(hctx->ccid3hctx_x_recv >> 6));
 
                ccid3_update_send_interval(hctx);
        }
-
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

Reply via email to