thermal: intel_pch_thermal: fix build for ACPI not enabled

[linux-2.6-microblaze.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index f470962..66a93f0 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1316,7 +1316,7 @@ static struct pcpu_chunk * __init pcpu_alloc_first_chunk(unsigned long tmp_addr,
 
        /* allocate chunk */
        alloc_size = sizeof(struct pcpu_chunk) +
-               BITS_TO_LONGS(region_size >> PAGE_SHIFT);
+               BITS_TO_LONGS(region_size >> PAGE_SHIFT) * sizeof(unsigned long);
        chunk = memblock_alloc(alloc_size, SMP_CACHE_BYTES);
        if (!chunk)
                panic("%s: Failed to allocate %zu bytes\n", __func__,
@@ -1584,8 +1584,7 @@ static enum pcpu_chunk_type pcpu_memcg_pre_alloc_hook(size_t size, gfp_t gfp,
 {
        struct obj_cgroup *objcg;
 
-       if (!memcg_kmem_enabled() || !(gfp & __GFP_ACCOUNT) ||
-           memcg_kmem_bypass())
+       if (!memcg_kmem_enabled() || !(gfp & __GFP_ACCOUNT))
                return PCPU_CHUNK_ROOT;
 
        objcg = get_obj_cgroup_from_current();