From: Andrew Morton <akpm@linux-foundation.org>

Deuglify via the Lunus trick.   Not sure it's much better :(

Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jakub Jelinek <jakub@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Roland McGrath <roland@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/binfmt_elf.c       |    2 +-
 include/asm-x86/elf.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/binfmt_elf.c~i386-and-x86_64-randomize-brk-fix fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~i386-and-x86_64-randomize-brk-fix
+++ a/fs/binfmt_elf.c
@@ -1021,7 +1021,7 @@ static int load_elf_binary(struct linux_
 	current->mm->end_data = end_data;
 	current->mm->start_stack = bprm->p;
 
-#ifdef ARCH_HAS_RANDOMIZE_BRK
+#ifdef arch_randomize_brk
 	if (current->flags & PF_RANDOMIZE)
 		current->mm->brk = current->mm->start_brk =
 			arch_randomize_brk(current->mm);
diff -puN include/asm-x86/elf.h~i386-and-x86_64-randomize-brk-fix include/asm-x86/elf.h
--- a/include/asm-x86/elf.h~i386-and-x86_64-randomize-brk-fix
+++ a/include/asm-x86/elf.h
@@ -285,8 +285,8 @@ struct linux_binprm;
 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 				       int executable_stack);
 
-#define ARCH_HAS_RANDOMIZE_BRK
 extern unsigned long arch_randomize_brk(struct mm_struct *mm);
+#define arch_randomize_brk arch_randomize_brk
 
 #endif /* __KERNEL__ */
 
_