diff options
-rw-r--r-- | mm/slob.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -428,7 +428,7 @@ out: | |||
428 | void *__kmalloc_node(size_t size, gfp_t gfp, int node) | 428 | void *__kmalloc_node(size_t size, gfp_t gfp, int node) |
429 | { | 429 | { |
430 | unsigned int *m; | 430 | unsigned int *m; |
431 | int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); | 431 | int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); |
432 | void *ret; | 432 | void *ret; |
433 | 433 | ||
434 | gfp &= gfp_allowed_mask; | 434 | gfp &= gfp_allowed_mask; |
@@ -481,7 +481,7 @@ void kfree(const void *block) | |||
481 | 481 | ||
482 | sp = virt_to_page(block); | 482 | sp = virt_to_page(block); |
483 | if (PageSlab(sp)) { | 483 | if (PageSlab(sp)) { |
484 | int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); | 484 | int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); |
485 | unsigned int *m = (unsigned int *)(block - align); | 485 | unsigned int *m = (unsigned int *)(block - align); |
486 | slob_free(m, *m + align); | 486 | slob_free(m, *m + align); |
487 | } else | 487 | } else |
@@ -500,7 +500,7 @@ size_t ksize(const void *block) | |||
500 | 500 | ||
501 | sp = virt_to_page(block); | 501 | sp = virt_to_page(block); |
502 | if (PageSlab(sp)) { | 502 | if (PageSlab(sp)) { |
503 | int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); | 503 | int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); |
504 | unsigned int *m = (unsigned int *)(block - align); | 504 | unsigned int *m = (unsigned int *)(block - align); |
505 | return SLOB_UNITS(*m) * SLOB_UNIT; | 505 | return SLOB_UNITS(*m) * SLOB_UNIT; |
506 | } else | 506 | } else |