From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 12 Oct 2005 22:12:21 +0000 (-0700)
Subject: [NETPOLL]: wrong return for null netpoll_poll_lock()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=afb997c6163b33292d31a09d6aa5cbb03ffa5bf1;p=deliverable%2Flinux.git

[NETPOLL]: wrong return for null netpoll_poll_lock()

When netpoll is not being used, the macro that
defines the removed routing netpoll_poll_lock
defines the return as zero, but the real
routine returns a `void *`

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 5ade54a78dbb..ca5a8733000f 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -86,7 +86,7 @@ static inline void netpoll_poll_unlock(void *have)
 
 #else
 #define netpoll_rx(a) 0
-#define netpoll_poll_lock(a) 0
+#define netpoll_poll_lock(a) NULL
 #define netpoll_poll_unlock(a)
 #endif