Merge tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block

[mirror_ubuntu-hirsute-kernel.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index 207c83ef6e06d3416aa40a67fd55628e66a88aba..74f7e09a7cfd1786e06767abc8c14de3ae45c660 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -348,7 +348,7 @@ static __always_inline int memcg_charge_slab(struct page *page,
                                             gfp_t gfp, int order,
                                             struct kmem_cache *s)
 {
-       unsigned int nr_pages = 1 << order;
+       int nr_pages = 1 << order;
        struct mem_cgroup *memcg;
        struct lruvec *lruvec;
        int ret;
@@ -388,7 +388,7 @@ out:
 static __always_inline void memcg_uncharge_slab(struct page *page, int order,
                                                struct kmem_cache *s)
 {
-       unsigned int nr_pages = 1 << order;
+       int nr_pages = 1 << order;
        struct mem_cgroup *memcg;
        struct lruvec *lruvec;