mirror of
https://github.com/adulau/aha.git
synced 2024-12-31 21:26:18 +00:00
Staging: android: binder: fix arm build errors
Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7c5151fbf1
commit
c171ac36b7
1 changed files with 3 additions and 3 deletions
|
@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct binder_proc *proc = vma->vm_private_data;
|
struct binder_proc *proc = vma->vm_private_data;
|
||||||
if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)
|
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();
|
dump_stack();
|
||||||
}
|
}
|
||||||
static void binder_vma_close(struct vm_area_struct *vma)
|
static void binder_vma_close(struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct binder_proc *proc = vma->vm_private_data;
|
struct binder_proc *proc = vma->vm_private_data;
|
||||||
if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)
|
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;
|
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;
|
vma->vm_end = vma->vm_start + SZ_4M;
|
||||||
|
|
||||||
if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)
|
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) {
|
if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {
|
||||||
ret = -EPERM;
|
ret = -EPERM;
|
||||||
|
|
Loading…
Reference in a new issue