From owner-svn-src-all@FreeBSD.ORG Sun May 25 18:47:25 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7732C70E; Sun, 25 May 2014 18:47:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6483E2752; Sun, 25 May 2014 18:47:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PIlPCt004568; Sun, 25 May 2014 18:47:25 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PIlPtj004567; Sun, 25 May 2014 18:47:25 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201405251847.s4PIlPtj004567@svn.freebsd.org> From: Zbigniew Bodek Date: Sun, 25 May 2014 18:47:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266672 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 18:47:25 -0000 Author: zbb Date: Sun May 25 18:47:24 2014 New Revision: 266672 URL: http://svnweb.freebsd.org/changeset/base/266672 Log: Fix context switch on PJ4Bv7 and remove obsolete pj4b_/arm11 functions Use armv7_setttb that sets proper PT attributes. Get rid of unused CPU functions, put nullop instead. Exchange obsolete pj4b_/arm11_ functions to the appropriate armv7_ ones. Modified: head/sys/arm/arm/cpufunc.c Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sun May 25 18:40:32 2014 (r266671) +++ head/sys/arm/arm/cpufunc.c Sun May 25 18:47:24 2014 (r266672) @@ -369,13 +369,13 @@ struct cpu_functions pj4bv7_cpufuncs = { /* CPU functions */ cpufunc_id, /* id */ - arm11_drain_writebuf, /* cpwait */ + armv7_drain_writebuf, /* cpwait */ /* MMU functions */ cpufunc_control, /* control */ cpufunc_domains, /* Domain */ - pj4b_setttb, /* Setttb */ + armv7_setttb, /* Setttb */ cpufunc_faultstatus, /* Faultstatus */ cpufunc_faultaddress, /* Faultaddress */ @@ -409,10 +409,10 @@ struct cpu_functions pj4bv7_cpufuncs = { /* Other functions */ - pj4b_drain_readbuf, /* flush_prefetchbuf */ - arm11_drain_writebuf, /* drain_writebuf */ - pj4b_flush_brnchtgt_all, /* flush_brnchtgt_C */ - pj4b_flush_brnchtgt_va, /* flush_brnchtgt_E */ + cpufunc_nullop, /* flush_prefetchbuf */ + armv7_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ (void *)cpufunc_nullop, /* sleep */ @@ -421,7 +421,7 @@ struct cpu_functions pj4bv7_cpufuncs = { cpufunc_null_fixup, /* dataabt_fixup */ cpufunc_null_fixup, /* prefetchabt_fixup */ - arm11_context_switch, /* context_switch */ + armv7_context_switch, /* context_switch */ pj4bv7_setup /* cpu setup */ };