Commit 88dca4ca authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

mm: remove the pgprot argument to __vmalloc 



The pgprot argument to __vmalloc is always PAGE_KERNEL now, so remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: Michael Kelley <mikelley@microsoft.com> [hyperv]
Acked-by: Gao Xiang <xiang@kernel.org> [erofs]
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200414131348.444715-22-hch@lst.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d28ff991

arch/x86/hyperv/hv_init.c

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static int hv_cpu_init(unsigned int cpu) 
	 * not be stopped in the case of CPU offlining and the VM will hang.

	 */

	if (!*hvp) {

		*hvp = __vmalloc(PAGE_SIZE, GFP_KERNEL | __GFP_ZERO,

				 PAGE_KERNEL);

		*hvp = __vmalloc(PAGE_SIZE, GFP_KERNEL | __GFP_ZERO);

	}



	if (*hvp) {

arch/x86/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -1279,8 +1279,7 @@ extern struct kmem_cache *x86_fpu_cache; 
#define __KVM_HAVE_ARCH_VM_ALLOC

static inline struct kvm *kvm_arch_alloc_vm(void)

{

	return __vmalloc(kvm_x86_ops.vm_size,

			 GFP_KERNEL_ACCOUNT | __GFP_ZERO, PAGE_KERNEL);

	return __vmalloc(kvm_x86_ops.vm_size, GFP_KERNEL_ACCOUNT | __GFP_ZERO);

}

void kvm_arch_free_vm(struct kvm *kvm);

arch/x86/kvm/svm/sev.c

+1 −2
Original line number Diff line number Diff line
@@ -336,8 +336,7 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, 
	/* Avoid using vmalloc for smaller buffers. */

	size = npages * sizeof(struct page *);

	if (size > PAGE_SIZE)

		pages = __vmalloc(size, GFP_KERNEL_ACCOUNT | __GFP_ZERO,

				  PAGE_KERNEL);

		pages = __vmalloc(size, GFP_KERNEL_ACCOUNT | __GFP_ZERO);

	else

		pages = kmalloc(size, GFP_KERNEL_ACCOUNT);

drivers/block/drbd/drbd_bitmap.c

+1 −3
Original line number Diff line number Diff line
@@ -396,9 +396,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
	bytes = sizeof(struct page *)*want;

	new_pages = kzalloc(bytes, GFP_NOIO | __GFP_NOWARN);

	if (!new_pages) {

		new_pages = __vmalloc(bytes,

				GFP_NOIO | __GFP_ZERO,

				PAGE_KERNEL);

		new_pages = __vmalloc(bytes, GFP_NOIO | __GFP_ZERO);

		if (!new_pages)

			return NULL;

	}

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) 
	file_size += sizeof(*iter.hdr) * n_obj;



	/* Allocate the file in vmalloc memory, it's likely to be big */

	iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,

			       PAGE_KERNEL);

	iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN |

			__GFP_NORETRY);

	if (!iter.start) {

		mutex_unlock(&gpu->mmu_context->lock);

		dev_warn(gpu->dev, "failed to allocate devcoredump file\n");