Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071a0bc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  mm: Export symbol ksize()
parents 3a4c6800 b1aabecd

mm/slab.c

+1 −0
Original line number Diff line number Diff line
@@ -4457,3 +4457,4 @@ size_t ksize(const void *objp) 


	return obj_size(virt_to_cache(objp));

}

EXPORT_SYMBOL(ksize);

mm/slob.c

+1 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ size_t ksize(const void *block) 
	} else

		return sp->page.private;

}

EXPORT_SYMBOL(ksize);



struct kmem_cache {

	unsigned int size, align;

mm/slub.c

+1 −0
Original line number Diff line number Diff line
@@ -2736,6 +2736,7 @@ size_t ksize(const void *object) 
	 */

	return s->size;

}

EXPORT_SYMBOL(ksize);



void kfree(const void *x)

{