projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[powerpc.git]
/
arch
/
x86_64
/
ia32
/
ia32_aout.c
diff --git
a/arch/x86_64/ia32/ia32_aout.c
b/arch/x86_64/ia32/ia32_aout.c
index
c12edf5
..
3bf58af
100644
(file)
--- a/
arch/x86_64/ia32/ia32_aout.c
+++ b/
arch/x86_64/ia32/ia32_aout.c
@@
-36,13
+36,10
@@
#undef WARN_OLD
#undef CORE_DUMP /* probably broken */
#undef WARN_OLD
#undef CORE_DUMP /* probably broken */
-extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
- unsigned long stack_top, int exec_stack);
-
static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
static int load_aout_library(struct file*);
static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
static int load_aout_library(struct file*);
-#if CORE_DUMP
+#if
def
CORE_DUMP
static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);
/*
static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);
/*
@@
-103,7
+100,7
@@
static struct linux_binfmt aout_format = {
.module = THIS_MODULE,
.load_binary = load_aout_binary,
.load_shlib = load_aout_library,
.module = THIS_MODULE,
.load_binary = load_aout_binary,
.load_shlib = load_aout_library,
-#if CORE_DUMP
+#if
def
CORE_DUMP
.core_dump = aout_core_dump,
#endif
.min_coredump = PAGE_SIZE
.core_dump = aout_core_dump,
#endif
.min_coredump = PAGE_SIZE
@@
-120,7
+117,7
@@
static void set_brk(unsigned long start, unsigned long end)
up_write(¤t->mm->mmap_sem);
}
up_write(¤t->mm->mmap_sem);
}
-#if CORE_DUMP
+#if
def
CORE_DUMP
/*
* These are the only things you should do on a core-file: use only these
* macros to write out all the necessary info.
/*
* These are the only things you should do on a core-file: use only these
* macros to write out all the necessary info.
@@
-314,7
+311,6
@@
static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
current->mm->free_area_cache = TASK_UNMAPPED_BASE;
current->mm->cached_hole_size = 0;
current->mm->free_area_cache = TASK_UNMAPPED_BASE;
current->mm->cached_hole_size = 0;
- set_mm_counter(current->mm, rss, 0);
current->mm->mmap = NULL;
compute_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;
current->mm->mmap = NULL;
compute_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;