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;