From owner-svn-src-head@FreeBSD.ORG Sat Feb 5 03:30:30 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02130106576C; Sat, 5 Feb 2011 03:30:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA51F8FC13; Sat, 5 Feb 2011 03:30:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p153UT8L013237; Sat, 5 Feb 2011 03:30:29 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p153UTkJ013233; Sat, 5 Feb 2011 03:30:29 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201102050330.p153UTkJ013233@svn.freebsd.org> From: Warner Losh Date: Sat, 5 Feb 2011 03:30:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218310 - in head/sys/arm: arm include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2011 03:30:30 -0000 Author: imp Date: Sat Feb 5 03:30:29 2011 New Revision: 218310 URL: http://svn.freebsd.org/changeset/base/218310 Log: Make md_tp a register_t not a void *. This will keep us from accidentally dereferencng it and might be one fewer things to change if arm64 happens... Submitted by: rwatson's question on irc... Modified: head/sys/arm/arm/sys_machdep.c head/sys/arm/arm/vm_machdep.c head/sys/arm/include/proc.h Modified: head/sys/arm/arm/sys_machdep.c ============================================================================== --- head/sys/arm/arm/sys_machdep.c Sat Feb 5 03:15:28 2011 (r218309) +++ head/sys/arm/arm/sys_machdep.c Sat Feb 5 03:30:29 2011 (r218310) @@ -85,7 +85,7 @@ static int arm32_set_tp(struct thread *td, void *args) { - td->td_md.md_tp = args; + td->td_md.md_tp = (register_t)args; return (0); } @@ -93,7 +93,7 @@ static int arm32_get_tp(struct thread *td, void *args) { - td->td_retval[0] = (uint32_t)td->td_md.md_tp; + td->td_retval[0] = td->td_md.md_tp; return (0); } Modified: head/sys/arm/arm/vm_machdep.c ============================================================================== --- head/sys/arm/arm/vm_machdep.c Sat Feb 5 03:15:28 2011 (r218309) +++ head/sys/arm/arm/vm_machdep.c Sat Feb 5 03:30:29 2011 (r218310) @@ -146,7 +146,7 @@ cpu_fork(register struct thread *td1, re /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_cspr = 0; - td2->td_md.md_tp = *(uint32_t **)ARM_TP_ADDRESS; + td2->td_md.md_tp = *(register_t *)ARM_TP_ADDRESS; } void @@ -370,10 +370,10 @@ cpu_set_user_tls(struct thread *td, void { if (td != curthread) - td->td_md.md_tp = tls_base; + td->td_md.md_tp = (register_t)tls_base; else { critical_enter(); - *(void **)ARM_TP_ADDRESS = tls_base; + *(register_t *)ARM_TP_ADDRESS = (register_t)tls_base; critical_exit(); } return (0); Modified: head/sys/arm/include/proc.h ============================================================================== --- head/sys/arm/include/proc.h Sat Feb 5 03:15:28 2011 (r218309) +++ head/sys/arm/include/proc.h Sat Feb 5 03:30:29 2011 (r218310) @@ -50,7 +50,7 @@ struct mdthread { register_t md_saved_cspr; /* (k) */ int md_ptrace_instr; int md_ptrace_addr; - void *md_tp; + register_t md_tp; void *md_ras_start; void *md_ras_end; };