aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrew Dodd <atd7@cornell.edu>2013-02-16 18:43:35 -0500
committerAndrew Dodd <atd7@cornell.edu>2013-02-27 09:19:13 -0500
commit19dd8724942d4998ccaa090daa2a69b33648d2bb (patch)
tree3ac48587c33355b9b1d08b70916249c5392a88ec /mm
parentb08797f2afdfc604c3143f8725d058aeef8ddcb2 (diff)
downloadkernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.zip
kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.gz
kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.bz2
Fix mistakes in merge
Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index a819c35..e9c4611 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1279,7 +1279,6 @@ static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va,
vm->pid = current->pid;
vm->task_name = current->comm;
#endif
- va->private = vm;
va->vm = vm;
va->flags |= VM_VM_AREA;
}