summaryrefslogtreecommitdiffstats
path: root/include/linux/netpoll.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2005-10-12 15:12:21 -0700
committerDavid S. Miller <davem@davemloft.net>2005-10-12 15:12:21 -0700
commitafb997c6163b33292d31a09d6aa5cbb03ffa5bf1 (patch)
treeee88c284b220e60088934b77797f4433590bf90c /include/linux/netpoll.h
parentab4060e858e36129f9319ef0fa055347ad60e1d5 (diff)
downloadlinux-stable-afb997c6163b33292d31a09d6aa5cbb03ffa5bf1.tar.gz
linux-stable-afb997c6163b33292d31a09d6aa5cbb03ffa5bf1.tar.bz2
linux-stable-afb997c6163b33292d31a09d6aa5cbb03ffa5bf1.zip
[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>
Diffstat (limited to 'include/linux/netpoll.h')
-rw-r--r--include/linux/netpoll.h2
1 files changed, 1 insertions, 1 deletions
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