Author: mmel
Date: Sun Apr 16 06:51:06 2017
New Revision: 317003
URL: https://svnweb.freebsd.org/changeset/base/317003
Log:
MFC r306704,r308406:
r306704:
ARM: Remove next bunch of unused cpu_functions from ARMv6.
r308406:
Only include sys/boot.h if LINUX_BOOT_ABI is defined
Modified:
stable/11/sys/arm/arm/cpufunc.c
stable/11/sys/arm/arm/machdep.c
stable/11/sys/arm/include/cpufunc.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/cpufunc.c
==============================================================================
--- stable/11/sys/arm/arm/cpufunc.c Sun Apr 16 06:35:09 2017
(r317002)
+++ stable/11/sys/arm/arm/cpufunc.c Sun Apr 16 06:51:06 2017
(r317003)
@@ -241,9 +241,6 @@ struct cpu_functions sheeva_cpufuncs = {
#ifdef CPU_MV_PJ4B
struct cpu_functions pj4bv7_cpufuncs = {
- /* MMU functions */
- .cf_control = cpufunc_control,
- .cf_setttb = armv7_setttb,
/* Cache operations */
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@@ -253,7 +250,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
- .cf_drain_writebuf = armv7_drain_writebuf,
.cf_sleep = (void *)cpufunc_nullop,
/* Soft functions */
@@ -417,9 +413,6 @@ struct cpu_functions fa526_cpufuncs = {
#if defined(CPU_ARM1176)
struct cpu_functions arm1176_cpufuncs = {
- /* MMU functions */
- .cf_control = cpufunc_control,
- .cf_setttb = arm11x6_setttb,
/* Cache operations */
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@@ -429,7 +422,6 @@ struct cpu_functions arm1176_cpufuncs =
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
- .cf_drain_writebuf = arm11_drain_writebuf,
.cf_sleep = arm11x6_sleep,
/* Soft functions */
@@ -439,9 +431,6 @@ struct cpu_functions arm1176_cpufuncs =
#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
struct cpu_functions cortexa_cpufuncs = {
- /* MMU functions */
- .cf_control = cpufunc_control,
- .cf_setttb = armv7_setttb,
/* Cache operations */
@@ -456,7 +445,6 @@ struct cpu_functions cortexa_cpufuncs =
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
- .cf_drain_writebuf = armv7_drain_writebuf,
.cf_sleep = armv7_cpu_sleep,
/* Soft functions */
Modified: stable/11/sys/arm/arm/machdep.c
==============================================================================
--- stable/11/sys/arm/arm/machdep.c Sun Apr 16 06:35:09 2017
(r317002)
+++ stable/11/sys/arm/arm/machdep.c Sun Apr 16 06:51:06 2017
(r317003)
@@ -76,7 +76,9 @@ __FBSDID("$FreeBSD$");
#include <sys/pcpu.h>
#include <sys/ptrace.h>
#include <sys/reboot.h>
+#if defined(LINUX_BOOT_ABI)
#include <sys/boot.h>
+#endif
#include <sys/rwlock.h>
#include <sys/sched.h>
#include <sys/signalvar.h>
@@ -412,7 +414,7 @@ arm_vector_init(vm_offset_t va, int whic
icache_sync(va, (ARM_NVEC * 2) * sizeof(u_int));
vector_page = va;
-
+#if __ARM_ARCH < 6
if (va == ARM_VECTORS_HIGH) {
/*
* Enable high vectors in the system control reg (SCTLR).
@@ -427,6 +429,7 @@ arm_vector_init(vm_offset_t va, int whic
*/
cpu_control(CPU_CONTROL_VECRELOC, CPU_CONTROL_VECRELOC);
}
+#endif
}
static void
Modified: stable/11/sys/arm/include/cpufunc.h
==============================================================================
--- stable/11/sys/arm/include/cpufunc.h Sun Apr 16 06:35:09 2017
(r317002)
+++ stable/11/sys/arm/include/cpufunc.h Sun Apr 16 06:51:06 2017
(r317003)
@@ -60,14 +60,12 @@ struct cpu_functions {
/* CPU functions */
#if __ARM_ARCH < 6
void (*cf_cpwait) (void);
-#endif
/* MMU functions */
u_int (*cf_control) (u_int bic, u_int eor);
void (*cf_setttb) (u_int ttb);
-#if __ARM_ARCH < 6
/* TLB functions */
void (*cf_tlb_flushID) (void);
@@ -149,7 +147,9 @@ struct cpu_functions {
/* Other functions */
+#if __ARM_ARCH < 6
void (*cf_drain_writebuf) (void);
+#endif
void (*cf_sleep) (int mode);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
