Module Name: src
Committed By: bsh
Date: Thu Mar 10 08:06:27 UTC 2011
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
add MPCore to CPU-ID table
add branch predict bit to arm11_options
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/arm/arm/cpufunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.102 src/sys/arch/arm/arm/cpufunc.c:1.103
--- src/sys/arch/arm/arm/cpufunc.c:1.102 Thu Mar 10 07:47:14 2011
+++ src/sys/arch/arm/arm/cpufunc.c Thu Mar 10 08:06:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.102 2011/03/10 07:47:14 bsh Exp $ */
+/* $NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.102 2011/03/10 07:47:14 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -2648,6 +2648,8 @@
{ "arm11.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) },
{ "arm11.icache", BIC, OR, CPU_CONTROL_IC_ENABLE },
{ "arm11.dcache", BIC, OR, CPU_CONTROL_DC_ENABLE },
+ { "cpu.branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE },
+ { "arm11.branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE },
{ NULL, IGN, IGN, 0 }
};
