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

Commit db1aecaf authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm/vmalloc.c: change void* into explict vm_struct* 



vmap_area->private is void* but we don't use the field for various purpose
but use only for vm_struct.  So change it to a vm_struct* with naming to
improve for readability and type checking.

Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3770490e

mm/vmalloc.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ struct vmap_area { 
	struct rb_node rb_node;		/* address sorted rbtree */

	struct rb_node rb_node;		/* address sorted rbtree */

	struct list_head list;		/* address sorted list */

	struct list_head list;		/* address sorted list */

	struct list_head purge_list;	/* "lazy purge" list */

	struct list_head purge_list;	/* "lazy purge" list */

	void *private;

	struct vm_struct *vm;

	struct rcu_head rcu_head;

	struct rcu_head rcu_head;

};

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

	vm->addr = (void *)va->va_start;

	vm->size = va->va_end - va->va_start;

	vm->size = va->va_end - va->va_start;

	vm->caller = caller;

	vm->caller = caller;

	va->private = vm;

	va->vm = vm;

	va->flags |= VM_VM_AREA;

	va->flags |= VM_VM_AREA;

}

}
@@ -1408,7 +1408,7 @@ static struct vm_struct *find_vm_area(const void *addr) 




	va = find_vmap_area((unsigned long)addr);

	va = find_vmap_area((unsigned long)addr);

	if (va && va->flags & VM_VM_AREA)

	if (va && va->flags & VM_VM_AREA)

		return va->private;

		return va->vm;





	return NULL;

	return NULL;

}

}
@@ -1427,7 +1427,7 @@ struct vm_struct *remove_vm_area(const void *addr) 




	va = find_vmap_area((unsigned long)addr);

	va = find_vmap_area((unsigned long)addr);

	if (va && va->flags & VM_VM_AREA) {

	if (va && va->flags & VM_VM_AREA) {

		struct vm_struct *vm = va->private;

		struct vm_struct *vm = va->vm;





		if (!(vm->flags & VM_UNLIST)) {

		if (!(vm->flags & VM_UNLIST)) {

			struct vm_struct *tmp, **p;

			struct vm_struct *tmp, **p;