diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-06-04 10:14:58 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-06-04 10:14:58 +0300 |
| commit | 23910c50cced8f35d53e4f8ea0cc09ad58d286af (patch) | |
| tree | 4e5c9ef6a09d234119a49d2623a0d042fe3af125 /include | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| parent | 57d437d2aa680f42d75cef45205834d5f605550a (diff) | |
Merge branch 'slub/cleanups' into slab/next
* Fix a merge conflict in mm/slub.c::acquire_slab() due to commit 02d7633
("slub: fix a memory leak in get_partial_node()").
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slub_def.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c2f8c8bc56ed..ebdcf4ba42ee 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -48,7 +48,6 @@ struct kmem_cache_cpu { unsigned long tid; /* Globally unique transaction id */ struct page *page; /* The slab from which we are allocating */ struct page *partial; /* Partially allocated frozen slabs */ - int node; /* The node of the page (or -1 for debug) */ #ifdef CONFIG_SLUB_STATS unsigned stat[NR_SLUB_STAT_ITEMS]; #endif |