diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-12 12:50:11 +0000 |
| commit | 72108d578689febd3579bf16be470328ded6c6d9 (patch) | |
| tree | cc36ad5306ce823f8e98956c8f048f48017be3cc /arch/um/sys-x86_64/vdso/vma.c | |
| parent | 330f78a83c1f47055427e10a68733af77b2cbac8 (diff) | |
| parent | 2150f72fe35397cc6d6ce39866bd0462cfbcc916 (diff) | |
Automatically merging tracking-igloo_kernel-other into merging-stable-linaro-ux500-3.1stable-linaro-ux500-3.1
Conflicting files:
Diffstat (limited to 'arch/um/sys-x86_64/vdso/vma.c')
| -rw-r--r-- | arch/um/sys-x86_64/vdso/vma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-x86_64/vdso/vma.c b/arch/um/sys-x86_64/vdso/vma.c index 9495c8d0ce3..91f4ec9a0a5 100644 --- a/arch/um/sys-x86_64/vdso/vma.c +++ b/arch/um/sys-x86_64/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; |