From ecedc3942fbe01d459dae66aa7ea1a03021ea154 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 5 Oct 2012 16:55:20 +0200 Subject: [PATCH] --- yaml --- r: 346879 b: refs/heads/master c: 789306e5ad6b3051c263ac2478875efa8bc07462 h: refs/heads/master i: 346877: 0cec41d541d499229aa34f9197c4d0fbf24fc06e 346875: ead670b5f74d960dbc7aca12b0a625ebbb521d89 346871: cc534b79a6812c3e2bfb20d587ec00ee5008c670 346863: 035e1d44085f5ff6a61c7b1773dc643ca502132a 346847: 88cde32c335e108591d06bfa14a3e33999132234 346815: 626c2a9622132727c245d535496900d1c0992eb2 346751: a1fbdfa992cdc73dcc9b015aaa86291beee2d5ad 346623: ba5383829df44978c396d8c5300c2f8dc931e463 v: v3 --- [refs] | 2 +- trunk/mm/slob.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2bb96c2f89c9..744da2077a64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8843922fba49e887874aa1f9e748d620c5092af +refs/heads/master: 789306e5ad6b3051c263ac2478875efa8bc07462 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index e7d790127e4b..87e16c4d9143 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -428,7 +428,7 @@ static __always_inline void * __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) { unsigned int *m; - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); void *ret; gfp &= gfp_allowed_mask; @@ -496,7 +496,7 @@ void kfree(const void *block) sp = virt_to_page(block); if (PageSlab(sp)) { - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); unsigned int *m = (unsigned int *)(block - align); slob_free(m, *m + align); } else @@ -519,7 +519,7 @@ size_t ksize(const void *block) if (unlikely(!PageSlab(sp))) return PAGE_SIZE << compound_order(sp); - align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); m = (unsigned int *)(block - align); return SLOB_UNITS(*m) * SLOB_UNIT; }