diff --git a/[refs] b/[refs] index 8e82ff2322ac..ae72112848af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66efc5a7e3061c3597ac43a8bb1026488d57e66b +refs/heads/master: 6e40e73097a5e4ad1b9f92fa21757343fdd6a682 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index c6100628a6ef..aea1cd25314b 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -2814,19 +2814,11 @@ static int cache_grow(struct kmem_cache *cachep, */ static void kfree_debugcheck(const void *objp) { - struct page *page; - if (!virt_addr_valid(objp)) { printk(KERN_ERR "kfree_debugcheck: out of range ptr %lxh.\n", (unsigned long)objp); BUG(); } - page = virt_to_page(objp); - if (!PageSlab(page)) { - printk(KERN_ERR "kfree_debugcheck: bad ptr %lxh.\n", - (unsigned long)objp); - BUG(); - } } static inline void verify_redzone_free(struct kmem_cache *cache, void *obj)