From owner-svn-src-head@freebsd.org Sat Jul 28 12:20:43 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 355C7104F867; Sat, 28 Jul 2018 12:20:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E02558B857; Sat, 28 Jul 2018 12:20:42 +0000 (UTC) (envelope-from andrew@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2FBA26884; Sat, 28 Jul 2018 12:20:42 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SCKgUq074847; Sat, 28 Jul 2018 12:20:42 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SCKgqw074845; Sat, 28 Jul 2018 12:20:42 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201807281220.w6SCKgqw074845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sat, 28 Jul 2018 12:20:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336828 - in head/sys/arm: arm include X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys/arm: arm include X-SVN-Commit-Revision: 336828 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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, 28 Jul 2018 12:20:43 -0000 Author: andrew Date: Sat Jul 28 12:20:42 2018 New Revision: 336828 URL: https://svnweb.freebsd.org/changeset/base/336828 Log: Make the arm cpu setup functions static. Any other place that needs these functions will use the function pointer we create for them. Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/include/cpufunc.h Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sat Jul 28 12:16:57 2018 (r336827) +++ head/sys/arm/arm/cpufunc.c Sat Jul 28 12:20:42 2018 (r336828) @@ -81,6 +81,19 @@ u_int arm_cache_type[14]; u_int arm_cache_loc; #if defined(CPU_ARM9E) +static void arm10_setup(void); +#endif +#ifdef CPU_MV_PJ4B +static void pj4bv7_setup(void); +#endif +#if defined(CPU_ARM1176) +static void arm11x6_setup(void); +#endif +#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) +static void cortexa_setup(void); +#endif + +#if defined(CPU_ARM9E) struct cpu_functions armv5_ec_cpufuncs = { /* CPU functions */ @@ -473,7 +486,7 @@ out: */ #if defined(CPU_ARM9E) -void +static void arm10_setup(void) { int cpuctrl, cpuctrlmask; @@ -544,7 +557,7 @@ cpu_scc_setup_ccnt(void) #endif #if defined(CPU_ARM1176) -void +static void arm11x6_setup(void) { uint32_t auxctrl, auxctrl_wax; @@ -576,7 +589,7 @@ arm11x6_setup(void) #endif /* CPU_ARM1176 */ #ifdef CPU_MV_PJ4B -void +static void pj4bv7_setup(void) { @@ -586,8 +599,7 @@ pj4bv7_setup(void) #endif /* CPU_MV_PJ4B */ #if defined(CPU_CORTEXA) || defined(CPU_KRAIT) - -void +static void cortexa_setup(void) { Modified: head/sys/arm/include/cpufunc.h ============================================================================== --- head/sys/arm/include/cpufunc.h Sat Jul 28 12:16:57 2018 (r336827) +++ head/sys/arm/include/cpufunc.h Sat Jul 28 12:20:42 2018 (r336828) @@ -220,8 +220,6 @@ u_int cpu_pfr (int); void arm9_tlb_flushID_SE (u_int va); void arm9_context_switch (void); -void arm10_setup (void); - u_int sheeva_control_ext (u_int, u_int); void sheeva_cpu_sleep (int); void sheeva_setttb (u_int); @@ -238,17 +236,12 @@ void sheeva_l2cache_wbinv_all (void); #if defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) || defined(CPU_KRAIT) void armv7_cpu_sleep (int); -void armv7_setup (void); - -void cortexa_setup (void); #endif #if defined(CPU_MV_PJ4B) void pj4b_config (void); -void pj4bv7_setup (void); #endif #if defined(CPU_ARM1176) -void arm11x6_setup (void); void arm11x6_sleep (int); /* no ref. for errata */ #endif