From: Christoph Hellwig <h...@lst.de>

[ Upstream commit 0348801151b5aefbcf9d6e9b9e30aceb3a2a7b13 ]

vmap does not take a gfp_t, the flags argument is for VM_* flags.

Signed-off-by: Christoph Hellwig <h...@lst.de>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Cc: Christian Borntraeger <borntrae...@de.ibm.com>
Cc: Christophe Leroy <christophe.le...@c-s.fr>
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: David Airlie <airl...@linux.ie>
Cc: Gao Xiang <xi...@kernel.org>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Haiyang Zhang <haiya...@microsoft.com>
Cc: Johannes Weiner <han...@cmpxchg.org>
Cc: "K. Y. Srinivasan" <k...@microsoft.com>
Cc: Laura Abbott <labb...@redhat.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Michael Kelley <mikel...@microsoft.com>
Cc: Minchan Kim <minc...@kernel.org>
Cc: Nitin Gupta <ngu...@vflare.org>
Cc: Peter Zijlstra (Intel) <pet...@infradead.org>
Cc: Robin Murphy <robin.mur...@arm.com>
Cc: Sakari Ailus <sakari.ai...@linux.intel.com>
Cc: Stephen Hemminger <sthem...@microsoft.com>
Cc: Sumit Semwal <sumit.sem...@linaro.org>
Cc: Wei Liu <wei....@kernel.org>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Heiko Carstens <heiko.carst...@de.ibm.com>
Cc: Paul Mackerras <pau...@ozlabs.org>
Cc: Vasily Gorbik <g...@linux.ibm.com>
Cc: Will Deacon <w...@kernel.org>
Link: http://lkml.kernel.org/r/20200414131348.444715-3-...@lst.de
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 arch/x86/kernel/irq_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 12df3a4abfdd..6b32ab009c19 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -43,7 +43,7 @@ static int map_irq_stack(unsigned int cpu)
                pages[i] = pfn_to_page(pa >> PAGE_SHIFT);
        }
 
-       va = vmap(pages, IRQ_STACK_SIZE / PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL);
+       va = vmap(pages, IRQ_STACK_SIZE / PAGE_SIZE, VM_MAP, PAGE_KERNEL);
        if (!va)
                return -ENOMEM;
 
-- 
2.25.1



Reply via email to