From 60d6b020c4dc06c8d1423d937996591ef3172393 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 28 Oct 2011 16:59:50 +1000 Subject: [PATCH] --- yaml --- r: 279734 b: refs/heads/master c: 33d4bcca603c9174c0ee0e312fd3c6da03ff9e15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/elf.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f47e65b8fb4f..68deb6e9a250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e95f7cdf5c3741ed00a298c0201d624833b4102 +refs/heads/master: 33d4bcca603c9174c0ee0e312fd3c6da03ff9e15 diff --git a/trunk/arch/m68k/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf.h index 01c193d91412..e9b7cda59744 100644 --- a/trunk/arch/m68k/include/asm/elf.h +++ b/trunk/arch/m68k/include/asm/elf.h @@ -59,10 +59,10 @@ typedef struct user_m68kfp_struct elf_fpregset_t; is actually used on ASV. */ #define ELF_PLAT_INIT(_r, load_addr) _r->a1 = 0 -#ifndef CONFIG_SUN3 -#define ELF_EXEC_PAGESIZE 4096 -#else +#if defined(CONFIG_SUN3) || defined(CONFIG_COLDFIRE) #define ELF_EXEC_PAGESIZE 8192 +#else +#define ELF_EXEC_PAGESIZE 4096 #endif /* This is the location that an ET_DYN program is loaded if exec'ed. Typical