From 7623d151d8387a574f88cf0ce8a9e168ff5b22e9 Mon Sep 17 00:00:00 2001
From: ganbold <ganbold@FreeBSD.org>
Date: Fri, 15 May 2015 00:39:51 +0000
Subject: [PATCH] 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@
---
 sys/arm/arm/cpufunc.c           | 2 +-
 sys/arm/arm/cpufunc_asm_armv7.S | 6 ------
 sys/arm/include/cpufunc.h       | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 86906ca92123..f3d9a525f419 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -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 */
 	
diff --git a/sys/arm/arm/cpufunc_asm_armv7.S b/sys/arm/arm/cpufunc_asm_armv7.S
index 7016d7eeffb0..1e7d7e2f0dc4 100644
--- a/sys/arm/arm/cpufunc_asm_armv7.S
+++ b/sys/arm/arm/cpufunc_asm_armv7.S
@@ -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)
-
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index 4d355d4a57da..5d1a72adedd8 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -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);