Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 26 Mar 2011 09:25:36 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r220026 - in head/sys: amd64/linux32 i386/linux
Message-ID:  <201103260925.p2Q9Pa4T009599@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Sat Mar 26 09:25:35 2011
New Revision: 220026
URL: http://svn.freebsd.org/changeset/base/220026

Log:
  Export the correct AT_PLATFORM value.
  Since signal trampolines are copied to the shared page do not need to
  leave place on the stack for it. Forgotten in the previous commit.
  
  MFC after:	1 Week

Modified:
  head/sys/amd64/linux32/linux32_sysvec.c
  head/sys/i386/linux/linux_sysvec.c

Modified: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c	Sat Mar 26 07:29:48 2011	(r220025)
+++ head/sys/amd64/linux32/linux32_sysvec.c	Sat Mar 26 09:25:35 2011	(r220026)
@@ -249,8 +249,7 @@ elf_linux_fixup(register_t **stack_base,
 	struct linux32_ps_strings *arginfo;
 
 	arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS;
-	uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szsigcode -
-	    linux_szplatform);
+	uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szplatform);
 
 	KASSERT(curthread->td_proc == imgp->proc,
 	    ("unsafe elf_linux_fixup(), should be curproc"));

Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c	Sat Mar 26 07:29:48 2011	(r220025)
+++ head/sys/i386/linux/linux_sysvec.c	Sat Mar 26 09:25:35 2011	(r220026)
@@ -249,8 +249,7 @@ elf_linux_fixup(register_t **stack_base,
 
 	p = imgp->proc;
 	arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings;
-	uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szsigcode -
-	    linux_szplatform);
+	uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szplatform);
 	args = (Elf32_Auxargs *)imgp->auxargs;
 	pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103260925.p2Q9Pa4T009599>