From a97c4be8a7da50608f2da3e0ae9472e36bba8a86 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri, 21 Mar 2008 15:54:53 -0700
Subject: [PATCH] --- yaml --- r: 90197 b: refs/heads/master c:
 4cd9029d25f6612302f82634620f107c65f790b1 h: refs/heads/master i:   90195:
 0f874737d40a5552526605bb98c57a1b0787ab4d v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1691e48b6f05..386cfb3f3483 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28518fc1701a757a3df8aa2d2ac2e5d1efd1c3e5
+refs/heads/master: 4cd9029d25f6612302f82634620f107c65f790b1
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 8358fff002eb..b89680d2693b 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -70,7 +70,11 @@
 #define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \
 					printk(KERN_DEBUG msg); } while (0)
 #else
-#define SOCK_DEBUG(sk, msg...) do { } while (0)
+/* Validate arguments and do nothing */
+static void inline int __attribute__ ((format (printf, 2, 3)))
+SOCK_DEBUG(struct sock *sk, const char *msg, ...)
+{
+}
 #endif
 
 /* This is the per-socket lock.  The spinlock provides a synchronization