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:
  slab: rename slab_destroy_objs
  slub: current is always valid
  slub: Add check for kfree() of non slab objects.

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 5f6e2c4a2ba7..488400d10700 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -411,7 +411,7 @@ static void set_track(struct kmem_cache *s, void *object,
         if (addr) {
                 p->addr = addr;
                 p->cpu = smp_processor_id();
-                p->pid = current ? current->pid : -1;
+                p->pid = current->pid;
                 p->when = jiffies;
         } else
                 memset(p, 0, sizeof(struct track));
@@ -2766,6 +2766,7 @@ void kfree(const void *x)
 
         page = virt_to_head_page(x);
         if (unlikely(!PageSlab(page))) {
+                BUG_ON(!PageCompound(page));
                 put_page(page);
                 return;
         }