git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
ia64
/
ia32
/
binfmt_elf32.c
diff --git
a/arch/ia64/ia32/binfmt_elf32.c
b/arch/ia64/ia32/binfmt_elf32.c
index
d6535e7
..
96b3e14
100644
(file)
--- a/
arch/ia64/ia32/binfmt_elf32.c
+++ b/
arch/ia64/ia32/binfmt_elf32.c
@@
-9,6
+9,7
@@
* 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed
* 09/14/01 D. Mosberger fixed memory management for gdt/tss page
*/
* 04/13/01 D. Mosberger dropped saving tssd in ar.k1---it's not needed
* 09/14/01 D. Mosberger fixed memory management for gdt/tss page
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-34,9
+35,6
@@
extern void ia64_elf32_init (struct pt_regs *regs);
static void elf32_set_personality (void);
static void elf32_set_personality (void);
-static unsigned long __attribute ((unused))
-randomize_stack_top(unsigned long stack_top);
-
#define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec)
#define elf_map elf32_map
#define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec)
#define elf_map elf32_map
@@
-267,7
+265,7
@@
elf32_set_personality (void)
}
static unsigned long
}
static unsigned long
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type
, unsigned long unused
)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
{
unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
{
unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;