mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-01 02:21:16 +00:00
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: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Minchan Kim <minchan@kernel.org>
This commit is contained in:
parent
efc42bc980
commit
5e6cafc83e
2 changed files with 13 additions and 13 deletions
|
@ -32,7 +32,7 @@ struct vm_struct {
|
||||||
struct page **pages;
|
struct page **pages;
|
||||||
unsigned int nr_pages;
|
unsigned int nr_pages;
|
||||||
phys_addr_t phys_addr;
|
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(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
|
||||||
extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
|
extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
|
||||||
unsigned long start, unsigned long end, gfp_t gfp_mask,
|
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 vfree(const void *addr);
|
||||||
|
|
||||||
extern void *vmap(struct page **pages, unsigned int count,
|
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(unsigned long size, unsigned long flags);
|
||||||
extern struct vm_struct *get_vm_area_caller(unsigned long size,
|
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,
|
extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
|
||||||
unsigned long start, unsigned long end);
|
unsigned long start, unsigned long end);
|
||||||
extern struct vm_struct *__get_vm_area_caller(unsigned long size,
|
extern struct vm_struct *__get_vm_area_caller(unsigned long size,
|
||||||
unsigned long flags,
|
unsigned long flags,
|
||||||
unsigned long start, unsigned long end,
|
unsigned long start, unsigned long end,
|
||||||
void *caller);
|
const void *caller);
|
||||||
extern struct vm_struct *remove_vm_area(const void *addr);
|
extern struct vm_struct *remove_vm_area(const void *addr);
|
||||||
|
|
||||||
extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
|
extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
|
||||||
|
|
18
mm/vmalloc.c
18
mm/vmalloc.c
|
@ -1280,7 +1280,7 @@ DEFINE_RWLOCK(vmlist_lock);
|
||||||
struct vm_struct *vmlist;
|
struct vm_struct *vmlist;
|
||||||
|
|
||||||
static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
|
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->flags = flags;
|
||||||
vm->addr = (void *)va->va_start;
|
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,
|
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);
|
setup_vmalloc_vm(vm, va, flags, caller);
|
||||||
insert_vmalloc_vmlist(vm);
|
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,
|
static struct vm_struct *__get_vm_area_node(unsigned long size,
|
||||||
unsigned long align, unsigned long flags, unsigned long start,
|
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 vmap_area *va;
|
||||||
struct vm_struct *area;
|
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,
|
struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags,
|
||||||
unsigned long start, unsigned long end,
|
unsigned long start, unsigned long end,
|
||||||
void *caller)
|
const void *caller)
|
||||||
{
|
{
|
||||||
return __get_vm_area_node(size, 1, flags, start, end, -1, GFP_KERNEL,
|
return __get_vm_area_node(size, 1, flags, start, end, -1, GFP_KERNEL,
|
||||||
caller);
|
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,
|
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,
|
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
||||||
-1, GFP_KERNEL, caller);
|
-1, GFP_KERNEL, caller);
|
||||||
|
@ -1568,9 +1568,9 @@ EXPORT_SYMBOL(vmap);
|
||||||
|
|
||||||
static void *__vmalloc_node(unsigned long size, unsigned long align,
|
static void *__vmalloc_node(unsigned long size, unsigned long align,
|
||||||
gfp_t gfp_mask, pgprot_t prot,
|
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,
|
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;
|
const int order = 0;
|
||||||
struct page **pages;
|
struct page **pages;
|
||||||
|
@ -1643,7 +1643,7 @@ fail:
|
||||||
*/
|
*/
|
||||||
void *__vmalloc_node_range(unsigned long size, unsigned long align,
|
void *__vmalloc_node_range(unsigned long size, unsigned long align,
|
||||||
unsigned long start, unsigned long end, gfp_t gfp_mask,
|
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;
|
struct vm_struct *area;
|
||||||
void *addr;
|
void *addr;
|
||||||
|
@ -1699,7 +1699,7 @@ fail:
|
||||||
*/
|
*/
|
||||||
static void *__vmalloc_node(unsigned long size, unsigned long align,
|
static void *__vmalloc_node(unsigned long size, unsigned long align,
|
||||||
gfp_t gfp_mask, pgprot_t prot,
|
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,
|
return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END,
|
||||||
gfp_mask, prot, node, caller);
|
gfp_mask, prot, node, caller);
|
||||||
|
|
Loading…
Reference in a new issue