From: Ben Dooks Date: Wed, 12 Oct 2005 22:12:21 +0000 (-0700) Subject: [NETPOLL]: wrong return for null netpoll_poll_lock() X-Git-Tag: v2.6.14-rc5~68^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=afb997c6163b33292d31a09d6aa5cbb03ffa5bf1;p=linux-2.6-omap-h63xx.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 Signed-off-by: David S. Miller --- diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 5ade54a78db..ca5a8733000 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