diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
| commit | be750231ce1599b86fbba213e3da8344ece262e2 (patch) | |
| tree | a506c461082692bb5bab8b9bb63a762816329454 /net | |
| parent | 18408ddc01136f505ae357c03f0d8e50b10e0db6 (diff) | |
| parent | 39e6dd73502f64e2ae3236b304e160ae30de9384 (diff) | |
| download | kernel_samsung_smdk4412-be750231ce1599b86fbba213e3da8344ece262e2.zip kernel_samsung_smdk4412-be750231ce1599b86fbba213e3da8344ece262e2.tar.gz kernel_samsung_smdk4412-be750231ce1599b86fbba213e3da8344ece262e2.tar.bz2 | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
kernel/perf_counter.c
Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 791d71a..6d47165 100644 --- a/net/socket.c +++ b/net/socket.c @@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, if (more) flags |= MSG_MORE; - return sock->ops->sendpage(sock, page, offset, size, flags); + return kernel_sendpage(sock, page, offset, size, flags); } static ssize_t sock_splice_read(struct file *file, loff_t *ppos, |