diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
| commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
| tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /net | |
| parent | 1b3edd9745ef3a9ee831fe5a611757686579c9e1 (diff) | |
| parent | e174d13010a6bd52045466bc35ca5a86e3f3ba9b (diff) | |
Merge branch 'master' into sh/cachetlb
Conflicts:
arch/sh/kernel/Makefile_64
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 791d71a36a93..6d4716559047 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, | |||
| 736 | if (more) | 736 | if (more) |
| 737 | flags |= MSG_MORE; | 737 | flags |= MSG_MORE; |
| 738 | 738 | ||
| 739 | return sock->ops->sendpage(sock, page, offset, size, flags); | 739 | return kernel_sendpage(sock, page, offset, size, flags); |
| 740 | } | 740 | } |
| 741 | 741 | ||
| 742 | static ssize_t sock_splice_read(struct file *file, loff_t *ppos, | 742 | static ssize_t sock_splice_read(struct file *file, loff_t *ppos, |