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

Commit c171ac36 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Greg Kroah-Hartman
Browse files

Staging: android: binder: fix arm build errors 



Reported-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7c5151fb

drivers/staging/android/binder.c

+3 −3
Original line number Diff line number Diff line
@@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_area_struct *vma) 
{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));

	dump_stack();

}

static void binder_vma_close(struct vm_area_struct *vma)

{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));

	proc->vma = NULL;

}
@@ -2677,7 +2677,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) 
		vma->vm_end = vma->vm_start + SZ_4M;



	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot));



	if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {

		ret = -EPERM;