diff options
author | Arve Hjønnevåg <arve@android.com> | 2009-01-08 18:28:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@kvm.kroah.org> | 2009-01-28 18:49:05 -0500 |
commit | c171ac36b74f6c90bc7a03c309136ba175314b6d (patch) | |
tree | dd680e4ce84a4202ce01b8cb9f132af77605be1e /drivers | |
parent | 7c5151fbf134e082bc7f2c0ed02684ed12578b3b (diff) |
Staging: android: binder: fix arm build errors
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/android/binder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 6a4ceacb33f5..ab014bc96831 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c | |||
@@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_area_struct *vma) | |||
2649 | { | 2649 | { |
2650 | struct binder_proc *proc = vma->vm_private_data; | 2650 | struct binder_proc *proc = vma->vm_private_data; |
2651 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) | 2651 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) |
2652 | 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); | 2652 | 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)); |
2653 | dump_stack(); | 2653 | dump_stack(); |
2654 | } | 2654 | } |
2655 | static void binder_vma_close(struct vm_area_struct *vma) | 2655 | static void binder_vma_close(struct vm_area_struct *vma) |
2656 | { | 2656 | { |
2657 | struct binder_proc *proc = vma->vm_private_data; | 2657 | struct binder_proc *proc = vma->vm_private_data; |
2658 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) | 2658 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) |
2659 | 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); | 2659 | 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)); |
2660 | proc->vma = NULL; | 2660 | proc->vma = NULL; |
2661 | } | 2661 | } |
2662 | 2662 | ||
@@ -2677,7 +2677,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) | |||
2677 | vma->vm_end = vma->vm_start + SZ_4M; | 2677 | vma->vm_end = vma->vm_start + SZ_4M; |
2678 | 2678 | ||
2679 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) | 2679 | if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) |
2680 | 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); | 2680 | 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)); |
2681 | 2681 | ||
2682 | if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) { | 2682 | if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) { |
2683 | ret = -EPERM; | 2683 | ret = -EPERM; |