diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 22:34:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 22:34:16 +1000 |
| commit | 678c9fa086c3785a95a09953f6c9efd03be13e79 (patch) | |
| tree | d99987575f74741b109025d465d2a8ee282ebf4f | |
| parent | 7b44104eca0c0ad78a64aa4e19344fd3678baa61 (diff) | |
| parent | 110b0b35212f50e8da13faba5a10769e02230e04 (diff) | |
Merge commit 'slab/for-next'
| -rw-r--r-- | mm/slub.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 845fd5a9cbef..713c6937f7c9 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)); @@ -2765,6 +2765,7 @@ void kfree(const void *x) page = virt_to_head_page(x); if (unlikely(!PageSlab(page))) { + BUG_ON(!PageCompound(page)); put_page(page); return; } |