mm: mm_event: add read io stat

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / mm / percpu-km.c

diff --git a/mm/percpu-km.c b/mm/percpu-km.c
index d2a76642c4ae89ecc5489dc430a7cddbce351b5e..c22d959105b605b3a073246459f9efdb5801560a 100644 (file)
--- a/mm/percpu-km.c
+++ b/mm/percpu-km.c
@@ -34,7 +34,7 @@
 #include <linux/log2.h>
 
 static int pcpu_populate_chunk(struct pcpu_chunk *chunk,
-                              int page_start, int page_end)
+                              int page_start, int page_end, gfp_t gfp)
 {
        return 0;
 }
@@ -45,18 +45,19 @@ static void pcpu_depopulate_chunk(struct pcpu_chunk *chunk,
        /* nada */
 }
 
-static struct pcpu_chunk *pcpu_create_chunk(void)
+static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp)
 {
        const int nr_pages = pcpu_group_sizes[0] >> PAGE_SHIFT;
        struct pcpu_chunk *chunk;
        struct page *pages;
+       unsigned long flags;
        int i;
 
-       chunk = pcpu_alloc_chunk();
+       chunk = pcpu_alloc_chunk(gfp);
        if (!chunk)
                return NULL;
 
-       pages = alloc_pages(GFP_KERNEL, order_base_2(nr_pages));
+       pages = alloc_pages(gfp | GFP_KERNEL, order_base_2(nr_pages));
        if (!pages) {
                pcpu_free_chunk(chunk);
                return NULL;
@@ -68,9 +69,9 @@ static struct pcpu_chunk *pcpu_create_chunk(void)
        chunk->data = pages;
        chunk->base_addr = page_address(pages) - pcpu_group_offsets[0];
 
-       spin_lock_irq(&pcpu_lock);
+       spin_lock_irqsave(&pcpu_lock, flags);
        pcpu_chunk_populated(chunk, 0, nr_pages, false);
-       spin_unlock_irq(&pcpu_lock);
+       spin_unlock_irqrestore(&pcpu_lock, flags);
 
        pcpu_stats_chunk_alloc();
        trace_percpu_create_chunk(chunk->base_addr);