From fa2b17b3cf3d60b8a9c47fc5a0319b9cb0572e11 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 5 Aug 2012 15:00:58 +0000 Subject: [PATCH] --- yaml --- r: 334641 b: refs/heads/master c: baaf1dd491433a78826150aff7411015de7e9b65 h: refs/heads/master i: 334639: 2d10802e3e4026c8b9b598320fc9f65461d48ed7 v: v3 --- [refs] | 2 +- trunk/mm/slob.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2b5a9e54af80..fc2dd2457e1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48968177312e01737c018fdb2430b703831cbc2e +refs/heads/master: baaf1dd491433a78826150aff7411015de7e9b65 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 45d4ca79933a..497c55e318a1 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -428,7 +428,7 @@ static void slob_free(void *block, int size) void *__kmalloc_node(size_t size, gfp_t gfp, int node) { 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; @@ -481,7 +481,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 @@ -500,7 +500,7 @@ size_t ksize(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); return SLOB_UNITS(*m) * SLOB_UNIT; } else