From 699a35c0eaa833a60d50e189fb55beed47856115 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 6 Dec 2006 20:36:41 -0800
Subject: [PATCH] --- yaml --- r: 42807 b: refs/heads/master c:
 138ae6631a3d6f86851dd53686fa88295d1398bd h: refs/heads/master i:   42805:
 8a06f46295f1fe46554727ddb8551b1b2298373c   42803:
 7bbfb5987410f893f0b4d3c3cbc6d41ec3774f1a   42799:
 017aeb36118b2e559a51b4373c4ab29072c56768 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8077d1879f7d..c4775f26cc10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20aa7b21b1cbd1aa3fbf5fc14da5f7484a61a824
+refs/heads/master: 138ae6631a3d6f86851dd53686fa88295d1398bd
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 7b8e5d668586..86f5d6e995bb 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -103,12 +103,12 @@
 #include	<linux/module.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
+#include	<linux/uaccess.h>
 #include	<linux/nodemask.h>
 #include	<linux/mempolicy.h>
 #include	<linux/mutex.h>
 #include	<linux/rtmutex.h>
 
-#include	<asm/uaccess.h>
 #include	<asm/cacheflush.h>
 #include	<asm/tlbflush.h>
 #include	<asm/page.h>
@@ -2124,7 +2124,6 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 	mutex_lock(&cache_chain_mutex);
 
 	list_for_each_entry(pc, &cache_chain, next) {
-		mm_segment_t old_fs = get_fs();
 		char tmp;
 		int res;
 
@@ -2133,9 +2132,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 		 * destroy its slab cache and no-one else reuses the vmalloc
 		 * area of the module.  Print a warning.
 		 */
-		set_fs(KERNEL_DS);
-		res = __get_user(tmp, pc->name);
-		set_fs(old_fs);
+		res = probe_kernel_address(pc->name, tmp);
 		if (res) {
 			printk("SLAB: cache with size %d has lost its name\n",
 			       pc->buffer_size);