From c2e62e8ac1a96fbe84c501d7638ec108abe5ef16 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 24 Oct 2011 18:15:32 -0400
Subject: [PATCH] --- yaml --- r: 273067 b: refs/heads/master c:
 0d65ede0a605d6252acc5c8a9c536c4cd0211f3c h: refs/heads/master i:   273065:
 984dd84254deeeda80071c4c0ac15f43b3b332c3   273063:
 e9dceb730608b4f1a4063765f611e36f142ff05a v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/um/vdso/vma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd656029bcaa..dbcc55c61635 100644
--- 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
index 9495c8d0ce37..91f4ec9a0a56 100644
--- 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;