diff options
Diffstat (limited to 'arch/x86_64/ia32/ia32_binfmt.c')
-rw-r--r-- | arch/x86_64/ia32/ia32_binfmt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c index 82ef182de6ae..543ef4f405e9 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/arch/x86_64/ia32/ia32_binfmt.c | |||
@@ -305,8 +305,6 @@ MODULE_AUTHOR("Eric Youngdale, Andi Kleen"); | |||
305 | #undef MODULE_DESCRIPTION | 305 | #undef MODULE_DESCRIPTION |
306 | #undef MODULE_AUTHOR | 306 | #undef MODULE_AUTHOR |
307 | 307 | ||
308 | #define elf_addr_t __u32 | ||
309 | |||
310 | static void elf32_init(struct pt_regs *); | 308 | static void elf32_init(struct pt_regs *); |
311 | 309 | ||
312 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 | 310 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 |
@@ -351,7 +349,7 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, | |||
351 | bprm->loader += stack_base; | 349 | bprm->loader += stack_base; |
352 | bprm->exec += stack_base; | 350 | bprm->exec += stack_base; |
353 | 351 | ||
354 | mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 352 | mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
355 | if (!mpnt) | 353 | if (!mpnt) |
356 | return -ENOMEM; | 354 | return -ENOMEM; |
357 | 355 | ||