From 474b797c0a3bb96df26ccfc6027b8598d038ff6c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 1 Feb 2006 06:06:16 -0500
Subject: [PATCH] --- yaml --- r: 20043 b: refs/heads/master c:
 be7ee9b2f5ef11448f79c2ff7f47eb21b7c008b4 h: refs/heads/master i:   20041:
 42c5441f37d439cb3b1287f36de404ce5ee6970a   20039:
 9e994da55412f4ca91e74b0aab97183a9cf1dfaf v: v3

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

diff --git a/[refs] b/[refs]
index 96acfac128e9..afbb06bd51f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73a09e626b9717851d3f7fd0230e401492ee326b
+refs/heads/master: be7ee9b2f5ef11448f79c2ff7f47eb21b7c008b4
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
index d1a05224627e..105a0d61eb1f 100644
--- a/trunk/drivers/base/memory.c
+++ b/trunk/drivers/base/memory.c
@@ -303,7 +303,7 @@ static int block_size_init(void)
  */
 #ifdef CONFIG_ARCH_MEMORY_PROBE
 static ssize_t
-memory_probe_store(struct class *class, const char __user *buf, size_t count)
+memory_probe_store(struct class *class, const char *buf, size_t count)
 {
 	u64 phys_addr;
 	int ret;