Author: ganbold Date: Fri May 15 00:39:51 2015 New Revision: 282934 URL: https://svnweb.freebsd.org/changeset/base/282934
Log: It appears to be armv7_sleep is a duplication of armv7_cpu_sleep. For consistency with the naming conventions used by the other implementations kill armv7_sleep and keep armv7_cpu_sleep. Differential Revision: https://reviews.freebsd.org/D2537 Submitted by: John Wehle Reviewed by: ian@, andrew@ Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/arm/cpufunc_asm_armv7.S head/sys/arm/include/cpufunc.h Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Thu May 14 22:50:07 2015 (r282933) +++ head/sys/arm/arm/cpufunc.c Fri May 15 00:39:51 2015 (r282934) @@ -673,7 +673,7 @@ struct cpu_functions cortexa_cpufuncs = cpufunc_nullop, /* flush_brnchtgt_C */ (void *)cpufunc_nullop, /* flush_brnchtgt_E */ - armv7_sleep, /* sleep */ + armv7_cpu_sleep, /* sleep */ /* Soft functions */ Modified: head/sys/arm/arm/cpufunc_asm_armv7.S ============================================================================== --- head/sys/arm/arm/cpufunc_asm_armv7.S Thu May 14 22:50:07 2015 (r282933) +++ head/sys/arm/arm/cpufunc_asm_armv7.S Fri May 15 00:39:51 2015 (r282934) @@ -366,9 +366,3 @@ ENTRY(armv7_idcache_inv_all) bx lr @ return END(armv7_idcache_inv_all) -ENTRY_NP(armv7_sleep) - dsb - wfi - bx lr -END(armv7_sleep) - Modified: head/sys/arm/include/cpufunc.h ============================================================================== --- head/sys/arm/include/cpufunc.h Thu May 14 22:50:07 2015 (r282933) +++ head/sys/arm/include/cpufunc.h Fri May 15 00:39:51 2015 (r282934) @@ -376,7 +376,6 @@ void armv7_setup (void); void armv7_context_switch (void); void armv7_drain_writebuf (void); void armv7_sev (void); -void armv7_sleep (int unused); u_int armv7_auxctrl (u_int, u_int); void armadaxp_idcache_wbinv_all (void); _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
