diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/x86_64/ia32/syscall32.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/x86_64/ia32/syscall32.c')
| -rw-r--r-- | arch/x86_64/ia32/syscall32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c index 3a01329473ab..3e5ed20cba45 100644 --- a/arch/x86_64/ia32/syscall32.c +++ b/arch/x86_64/ia32/syscall32.c | |||
| @@ -49,7 +49,7 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) | |||
| 49 | struct mm_struct *mm = current->mm; | 49 | struct mm_struct *mm = current->mm; |
| 50 | int ret; | 50 | int ret; |
| 51 | 51 | ||
| 52 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 52 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
| 53 | if (!vma) | 53 | if (!vma) |
| 54 | return -ENOMEM; | 54 | return -ENOMEM; |
| 55 | 55 | ||