diff options
| -rw-r--r-- | mm/slub.c | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -1109,8 +1109,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) | |||
| 1109 | } | 1109 | } |
| 1110 | 1110 | ||
| 1111 | if (kmemcheck_enabled | 1111 | if (kmemcheck_enabled |
| 1112 | && !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) | 1112 | && !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) { |
| 1113 | { | ||
| 1114 | int pages = 1 << oo_order(oo); | 1113 | int pages = 1 << oo_order(oo); |
| 1115 | 1114 | ||
| 1116 | kmemcheck_alloc_shadow(page, oo_order(oo), flags, node); | 1115 | kmemcheck_alloc_shadow(page, oo_order(oo), flags, node); |
| @@ -2001,7 +2000,7 @@ static inline int calculate_order(int size) | |||
| 2001 | return order; | 2000 | return order; |
| 2002 | fraction /= 2; | 2001 | fraction /= 2; |
| 2003 | } | 2002 | } |
| 2004 | min_objects --; | 2003 | min_objects--; |
| 2005 | } | 2004 | } |
| 2006 | 2005 | ||
| 2007 | /* | 2006 | /* |
