X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Futil.c;h=5f4bb59da63c5938a166023f963b985b9ecaf3cb;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=7368479220b3b4c3d8c12a9306bb18221d9a99b9;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/mm/util.c b/mm/util.c
index 736847922..5f4bb59da 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -1,22 +1,20 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/err.h>
-#include <asm/uaccess.h>
 
 /**
- * __kzalloc - allocate memory. The memory is set to zero.
+ * kzalloc - allocate memory. The memory is set to zero.
  * @size: how many bytes of memory are required.
  * @flags: the type of memory to allocate.
  */
-void *__kzalloc(size_t size, gfp_t flags)
+void *kzalloc(size_t size, gfp_t flags)
 {
-	void *ret = ____kmalloc(size, flags);
+	void *ret = kmalloc(size, flags);
 	if (ret)
 		memset(ret, 0, size);
 	return ret;
 }
-EXPORT_SYMBOL(__kzalloc);
+EXPORT_SYMBOL(kzalloc);
 
 /*
  * kstrdup - allocate space for and copy an existing string
@@ -33,44 +31,9 @@ char *kstrdup(const char *s, gfp_t gfp)
 		return NULL;
 
 	len = strlen(s) + 1;
-	buf = ____kmalloc(len, gfp);
+	buf = kmalloc(len, gfp);
 	if (buf)
 		memcpy(buf, s, len);
 	return buf;
 }
 EXPORT_SYMBOL(kstrdup);
-
-/*
- * strndup_user - duplicate an existing string from user space
- *
- * @s: The string to duplicate
- * @n: Maximum number of bytes to copy, including the trailing NUL.
- */
-char *strndup_user(const char __user *s, long n)
-{
-	char *p;
-	long length;
-
-	length = strnlen_user(s, n);
-
-	if (!length)
-		return ERR_PTR(-EFAULT);
-
-	if (length > n)
-		return ERR_PTR(-EINVAL);
-
-	p = kmalloc(length, GFP_KERNEL);
-
-	if (!p)
-		return ERR_PTR(-ENOMEM);
-
-	if (copy_from_user(p, s, length)) {
-		kfree(p);
-		return ERR_PTR(-EFAULT);
-	}
-
-	p[length - 1] = '\0';
-
-	return p;
-}
-EXPORT_SYMBOL(strndup_user);