From fccbed10d1941f70cb7ffb96da8264134af39cd8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Aug 2009 08:28:36 -0700
Subject: [PATCH] --- yaml --- r: 156686 b: refs/heads/master c:
 e694958388c50148389b0e9b9e9e8945cf0f1b98 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d38e0c169fa..0cdd3686f7da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3620f7545344f932873bf98fbdf416b49409c8e
+refs/heads/master: e694958388c50148389b0e9b9e9e8945cf0f1b98
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 791d71a36a93..6d4716559047 100644
--- a/trunk/net/socket.c
+++ b/trunk/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,