From owner-svn-src-stable@freebsd.org Sat Jan 9 15:57:30 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3063BA6918B; Sat, 9 Jan 2016 15:57:30 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0214E1DDB; Sat, 9 Jan 2016 15:57:29 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u09FvTIq028756; Sat, 9 Jan 2016 15:57:29 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u09FvT23028754; Sat, 9 Jan 2016 15:57:29 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201601091557.u09FvT23028754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 9 Jan 2016 15:57:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293523 - stable/10/sys/compat/linux X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2016 15:57:30 -0000 Author: dchagin Date: Sat Jan 9 15:57:28 2016 New Revision: 293523 URL: https://svnweb.freebsd.org/changeset/base/293523 Log: MFC r283417: Add 64 bit support to the vdso. Modified: stable/10/sys/compat/linux/linux_vdso.c stable/10/sys/compat/linux/linux_vdso.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/compat/linux/linux_vdso.c ============================================================================== --- stable/10/sys/compat/linux/linux_vdso.c Sat Jan 9 15:56:01 2016 (r293522) +++ stable/10/sys/compat/linux/linux_vdso.c Sat Jan 9 15:57:28 2016 (r293523) @@ -29,7 +29,11 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) #define __ELF_WORD_SIZE 32 +#else +#define __ELF_WORD_SIZE 64 +#endif #include #include @@ -135,7 +139,7 @@ __elfN(linux_vdso_fixup)(struct sysentve } void -__elfN(linux_vdso_reloc)(struct sysentvec *sv, int vdso_adjust) +__elfN(linux_vdso_reloc)(struct sysentvec *sv, long vdso_adjust) { struct linux_vdso_sym *lsym; Elf_Ehdr *ehdr; Modified: stable/10/sys/compat/linux/linux_vdso.h ============================================================================== --- stable/10/sys/compat/linux/linux_vdso.h Sat Jan 9 15:56:01 2016 (r293522) +++ stable/10/sys/compat/linux/linux_vdso.h Sat Jan 9 15:57:28 2016 (r293523) @@ -41,7 +41,7 @@ struct linux_vdso_sym { vm_object_t __elfN(linux_shared_page_init)(char **); void __elfN(linux_shared_page_fini)(vm_object_t); void __elfN(linux_vdso_fixup)(struct sysentvec *); -void __elfN(linux_vdso_reloc)(struct sysentvec *, int); +void __elfN(linux_vdso_reloc)(struct sysentvec *, long); void __elfN(linux_vdso_sym_init)(struct linux_vdso_sym *); #define LINUX_VDSO_SYM_INTPTR(name) \