---

yaml --- r: 273067 b: refs/heads/master c: 0d65ede h: refs/heads/master i: 273065: 984dd84 273063: e9dceb7 v: v3
git-mirror · Nov 2, 2011 · c2e62e8 · c2e62e8
1 parent 610ef33
commit c2e62e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3369465ed1a6a9aa9b885a6d7d8e074ecbd782da
+refs/heads/master: 0d65ede0a605d6252acc5c8a9c536c4cd0211f3c
diff --git a/trunk/arch/x86/um/vdso/vma.c b/trunk/arch/x86/um/vdso/vma.c
@@ -28,7 +28,7 @@ static int __init init_vdso(void)
 
 	um_vdso_addr = task_size - PAGE_SIZE;
 
-	vdsop = kmalloc(GFP_KERNEL, sizeof(struct page *));
+	vdsop = kmalloc(sizeof(struct page *), GFP_KERNEL);
 	if (!vdsop)
 		goto oom;