Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6cafc8 authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

mm: vmalloc: use const void * for caller argument 



'const void *' is a safer type for caller function type. This patch
updates all references to caller function type.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarMinchan Kim <minchan@kernel.org>
parent efc42bc9

include/linux/vmalloc.h

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct vm_struct { 
	struct page		**pages;

	unsigned int		nr_pages;

	phys_addr_t		phys_addr;

	void			*caller;

	const void		*caller;

};



/*
@@ -62,7 +62,7 @@ extern void *vmalloc_32_user(unsigned long size); 
extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);

extern void *__vmalloc_node_range(unsigned long size, unsigned long align,

			unsigned long start, unsigned long end, gfp_t gfp_mask,

			pgprot_t prot, int node, void *caller);

			pgprot_t prot, int node, const void *caller);

extern void vfree(const void *addr);



extern void *vmap(struct page **pages, unsigned int count,
@@ -85,13 +85,13 @@ static inline size_t get_vm_area_size(const struct vm_struct *area) 


extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);

extern struct vm_struct *get_vm_area_caller(unsigned long size,

					unsigned long flags, void *caller);

					unsigned long flags, const void *caller);

extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,

					unsigned long start, unsigned long end);

extern struct vm_struct *__get_vm_area_caller(unsigned long size,

					unsigned long flags,

					unsigned long start, unsigned long end,

					void *caller);

					const void *caller);

extern struct vm_struct *remove_vm_area(const void *addr);



extern int map_vm_area(struct vm_struct *area, pgprot_t prot,

mm/vmalloc.c

+9 −9
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ DEFINE_RWLOCK(vmlist_lock); 
struct vm_struct *vmlist;



static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,

			      unsigned long flags, void *caller)

			      unsigned long flags, const void *caller)

{

	vm->flags = flags;

	vm->addr = (void *)va->va_start;
@@ -1306,7 +1306,7 @@ static void insert_vmalloc_vmlist(struct vm_struct *vm) 
}



static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,

			      unsigned long flags, void *caller)

			      unsigned long flags, const void *caller)

{

	setup_vmalloc_vm(vm, va, flags, caller);

	insert_vmalloc_vmlist(vm);
@@ -1314,7 +1314,7 @@ static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, 


static struct vm_struct *__get_vm_area_node(unsigned long size,

		unsigned long align, unsigned long flags, unsigned long start,

		unsigned long end, int node, gfp_t gfp_mask, void *caller)

		unsigned long end, int node, gfp_t gfp_mask, const void *caller)

{

	struct vmap_area *va;

	struct vm_struct *area;
@@ -1375,7 +1375,7 @@ EXPORT_SYMBOL_GPL(__get_vm_area); 


struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags,

				       unsigned long start, unsigned long end,

				       void *caller)

				       const void *caller)

{

	return __get_vm_area_node(size, 1, flags, start, end, -1, GFP_KERNEL,

				  caller);
@@ -1397,7 +1397,7 @@ struct vm_struct *get_vm_area(unsigned long size, unsigned long flags) 
}



struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,

				void *caller)

				const void *caller)

{

	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,

						-1, GFP_KERNEL, caller);
@@ -1568,9 +1568,9 @@ EXPORT_SYMBOL(vmap); 


static void *__vmalloc_node(unsigned long size, unsigned long align,

			    gfp_t gfp_mask, pgprot_t prot,

			    int node, void *caller);

			    int node, const void *caller);

static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,

				 pgprot_t prot, int node, void *caller)

				 pgprot_t prot, int node, const void *caller)

{

	const int order = 0;

	struct page **pages;
@@ -1643,7 +1643,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, 
 */

void *__vmalloc_node_range(unsigned long size, unsigned long align,

			unsigned long start, unsigned long end, gfp_t gfp_mask,

			pgprot_t prot, int node, void *caller)

			pgprot_t prot, int node, const void *caller)

{

	struct vm_struct *area;

	void *addr;
@@ -1699,7 +1699,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, 
 */

static void *__vmalloc_node(unsigned long size, unsigned long align,

			    gfp_t gfp_mask, pgprot_t prot,

			    int node, void *caller)

			    int node, const void *caller)

{

	return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END,

				gfp_mask, prot, node, caller);