summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/android
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/android')
-rw-r--r--kernel/drivers/android/binder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/drivers/android/binder.c b/kernel/drivers/android/binder.c
index 6607f3c6a..7d00b7a01 100644
--- a/kernel/drivers/android/binder.c
+++ b/kernel/drivers/android/binder.c
@@ -2074,7 +2074,7 @@ static int binder_thread_write(struct binder_proc *proc,
if (get_user(cookie, (binder_uintptr_t __user *)ptr))
return -EFAULT;
- ptr += sizeof(void *);
+ ptr += sizeof(cookie);
list_for_each_entry(w, &proc->delivered_death, entry) {
struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);
@@ -2834,7 +2834,7 @@ static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return VM_FAULT_SIGBUS;
}
-static struct vm_operations_struct binder_vm_ops = {
+static const struct vm_operations_struct binder_vm_ops = {
.open = binder_vma_open,
.close = binder_vma_close,
.fault = binder_vm_fault,