Merge /spare/repo/linux-2.6/

[powerpc.git] / include / net / inet_connection_sock.h

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 8a87a3a..651f824 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -147,7 +147,7 @@ static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what)
        }
 #ifdef INET_CSK_DEBUG
        else {
-               pr_debug(inet_csk_timer_bug_msg);
+               pr_debug("%s", inet_csk_timer_bug_msg);
        }
 #endif
 }
@@ -180,7 +180,7 @@ static inline void inet_csk_reset_xmit_timer(struct sock *sk, const int what,
        }
 #ifdef INET_CSK_DEBUG
        else {
-               pr_debug(inet_csk_timer_bug_msg);
+               pr_debug("%s", inet_csk_timer_bug_msg);
        }
 #endif
 }