aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-04-11 07:59:36 -0400
committerJens Axboe <axboe@suse.de>2006-04-11 07:59:36 -0400
commit88e6faefaeed40a162041d85689e94595756d4c3 (patch)
tree78724ca8f0b7a5d0cf6071e5615e2e6eee3ab7f4 /net/socket.c
parent341b446bc5aa36d1d5b8159c1e66716b5d89024d (diff)
[PATCH] splice: warning fix
From: Andrew Morton <akpm@osdl.org> net/socket.c:148: warning: initialization from incompatible pointer type extern declarations in .c files! Bad boy. Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/socket.c b/net/socket.c
index b807f360e02c..9ed9f6521155 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -119,10 +119,6 @@ static ssize_t sock_writev(struct file *file, const struct iovec *vector,
119static ssize_t sock_sendpage(struct file *file, struct page *page, 119static ssize_t sock_sendpage(struct file *file, struct page *page,
120 int offset, size_t size, loff_t *ppos, int more); 120 int offset, size_t size, loff_t *ppos, int more);
121 121
122extern ssize_t generic_splice_sendpage(struct inode *inode, struct file *out,
123 size_t len, unsigned int flags);
124
125
126/* 122/*
127 * Socket files have a set of 'special' operations as well as the generic file ones. These don't appear 123 * Socket files have a set of 'special' operations as well as the generic file ones. These don't appear
128 * in the operation structures but are done directly via the socketcall() multiplexor. 124 * in the operation structures but are done directly via the socketcall() multiplexor.