diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-20 19:59:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-20 19:59:30 +1100 |
| commit | bc1f7bb863a82c0950c4e13c700689ef18f708e0 (patch) | |
| tree | a365c78a8e77550b268b5cd692dea48065481e90 | |
| parent | 0bb79d135143c1e80428069eaea59853ac1d015e (diff) | |
slab: fixup for bad merge
I forgot to remove one line when fixing the merge of the slab tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | mm/slub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 5f87cb91645a..625552ecf487 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2747,7 +2747,6 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) void *ret; if (unlikely(size > SLUB_MAX_SIZE)) { - if (unlikely(size > PAGE_SIZE)) { ret = kmalloc_large_node(size, flags, node); kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC, |