[PATCH net] busy_poll: cleanup do-nothing placeholders

From: Eliezer Tamir
Date: Sun Aug 04 2013 - 05:56:05 EST

When renaming ll_poll to busy poll, I introduced a typo
in the name of the do-nothing placeholder for sk_busy_loop
and called it sk_busy_poll.
This broke compile when busy poll was not configured.
Cong Wang submitted a patch to fixed that.
This patch removes the now redundant, misspelled placeholder.

Signed-off-by: Eliezer Tamir <eliezer.tamir@xxxxxxxxxxxxxxx>

include/net/busy_poll.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index f18b919..8e2dfc1 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -162,11 +162,6 @@ static inline bool sk_can_busy_loop(struct sock *sk)
return false;

-static inline bool sk_busy_poll(struct sock *sk, int nonblock)
- return false;
static inline void skb_mark_napi_id(struct sk_buff *skb,
struct napi_struct *napi)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/