From patchwork Fri Mar 26 09:55:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Stubbs X-Patchwork-Id: 88439 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2Q9tg4P005116 for ; Fri, 26 Mar 2010 09:55:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622Ab0CZJzm (ORCPT ); Fri, 26 Mar 2010 05:55:42 -0400 Received: from mail.codesourcery.com ([38.113.113.100]:48228 "EHLO mail.codesourcery.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499Ab0CZJzl (ORCPT ); Fri, 26 Mar 2010 05:55:41 -0400 Received: (qmail 32345 invoked from network); 26 Mar 2010 09:55:39 -0000 Received: from unknown (HELO ?192.168.0.100?) (ams@127.0.0.2) by mail.codesourcery.com with ESMTPA; 26 Mar 2010 09:55:39 -0000 Message-ID: <4BAC849A.9090403@codesourcery.com> Date: Fri, 26 Mar 2010 09:55:38 +0000 From: Andrew Stubbs User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: "linux-sh@vger.kernel.org" Subject: [PATCH 2.6.34-rc2] sh: Fix FDPIC binary loader Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Mar 2010 09:55:42 +0000 (UTC) diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ac04255..b2fefb3 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h @@ -211,15 +211,17 @@ extern void __kernel_vsyscall; #define VSYSCALL_AUX_ENT \ if (vdso_enabled) \ - NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); + NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ + else \ + NEW_AUX_ENT(AT_IGNORE, 0); /* Match AT_VECTOR_SIZE_ARCH. */ #else -#define VSYSCALL_AUX_ENT +#define VSYSCALL_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0); #endif /* CONFIG_VSYSCALL */ #ifdef CONFIG_SH_FPU #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) #else -#define FPU_AUX_ENT +#define FPU_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0); #endif extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;