diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-07-21 07:37:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:49:14 -0400 |
commit | d4e3cc387ea1b74c3ad2ef2f6f5c05fd6fc314b8 (patch) | |
tree | b14dde552be76614fe443eccbb15658f651fc36c /arch/ia64/ia32 | |
parent | 80e27982a66ea8306a704ba8bdf634ed480d4b46 (diff) |
revert "PIE randomization"
There are reports of this causing userspace failures
(http://lkml.org/lkml/2007/7/20/421).
Revert.
Cc: Jan Kratochvil <honza@jikos.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Ulrich Kunitz <kune@deine-taler.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Bret Towe" <magnade@gmail.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/ia32')
-rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index e1189ba1ca5..1cfab326fb7 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
@@ -226,7 +226,7 @@ elf32_set_personality (void) | |||
226 | } | 226 | } |
227 | 227 | ||
228 | static unsigned long | 228 | static unsigned long |
229 | elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) | 229 | elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) |
230 | { | 230 | { |
231 | unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; | 231 | unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; |
232 | 232 | ||