From f651eb4fcd8e85c0e8eaaac6980e0802a6e0f46b Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Wed, 23 Sep 2009 15:57:09 -0700
Subject: [PATCH] --- yaml --- r: 165693 b: refs/heads/master c:
 bb521c5de070b86a1e049e2dbf62328f717ff1e8 h: refs/heads/master i:   165691:
 5d1d8bb4fc758820c1a7f12459ea306aa36a3829 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/mem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4952aab0af22..e6e4d3335e14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b8c78f2bfa6ebed0f47794b5995a0d4b3fe456d
+refs/heads/master: bb521c5de070b86a1e049e2dbf62328f717ff1e8
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 0aede1d6a9ea..6c8b65d069e5 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -690,7 +690,7 @@ static ssize_t read_zero(struct file * file, char __user * buf,
 
 		if (chunk > PAGE_SIZE)
 			chunk = PAGE_SIZE;	/* Just for latency reasons */
-		unwritten = clear_user(buf, chunk);
+		unwritten = __clear_user(buf, chunk);
 		written += chunk - unwritten;
 		if (unwritten)
 			break;