diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 |
| commit | 81cfb8864c73230eb1c37753aba517db15cf4d8f (patch) | |
| tree | 649ff25543834cf9983ea41b93126bea97d75475 /mm/slab.c | |
| parent | 0169e284f6b6b263cc7c2ed25986b96cd6fda610 (diff) | |
| parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
| download | kernel_samsung_tuna-81cfb8864c73230eb1c37753aba517db15cf4d8f.zip kernel_samsung_tuna-81cfb8864c73230eb1c37753aba517db15cf4d8f.tar.gz kernel_samsung_tuna-81cfb8864c73230eb1c37753aba517db15cf4d8f.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2419,6 +2419,7 @@ retry: next = slab_bufctl(slabp)[slabp->free]; #if DEBUG slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE; + WARN_ON(numa_node_id() != slabp->nodeid); #endif slabp->free = next; } @@ -2633,8 +2634,10 @@ static void free_block(kmem_cache_t *cachep, void **objpp, int nr_objects, int n check_spinlock_acquired_node(cachep, node); check_slabp(cachep, slabp); - #if DEBUG + /* Verify that the slab belongs to the intended node */ + WARN_ON(slabp->nodeid != node); + if (slab_bufctl(slabp)[objnr] != BUFCTL_FREE) { printk(KERN_ERR "slab: double free detected in cache " "'%s', objp %p\n", cachep->name, objp); |