Module Name: src
Committed By: matt
Date: Thu May 26 19:24:31 UTC 2011
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: std.rmixl
src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c
Log Message:
Use new MIPS64*_RMIXL options
If MP, store address of &pmap_tlb0_info.ti_lock->mtx_lock to OSSCRATCH 2
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/evbmips/conf/std.rmixl
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/arch/evbmips/rmixl/machdep.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/evbmips/conf/std.rmixl
diff -u src/sys/arch/evbmips/conf/std.rmixl:1.1.2.4 src/sys/arch/evbmips/conf/std.rmixl:1.1.2.5
--- src/sys/arch/evbmips/conf/std.rmixl:1.1.2.4 Mon Mar 29 23:31:16 2010
+++ src/sys/arch/evbmips/conf/std.rmixl Thu May 26 19:24:31 2011
@@ -1,18 +1,19 @@
-# $NetBSD: std.rmixl,v 1.1.2.4 2010/03/29 23:31:16 cliff Exp $
+# std.rmixl,v 1.1.2.4 2010/03/29 23:31:16 cliff Exp
machine evbmips mips
include "conf/std" # MI standard options
-options MIPS3_ENABLE_CLOCK_INTR
+options MIPS3_ENABLE_CLOCK_INTR
# Platform support
-options MIPS64
+#options MIPS64
options MIPS64_XLR
options MIPS64_XLS
+options MIPS64_RMIXL
-options EXEC_ELF32 # exec ELF32 binaries
-options EXEC_SCRIPT # exec #! scripts
+options EXEC_ELF32 # exec ELF32 binaries
+options EXEC_SCRIPT # exec #! scripts
makeoptions CPUFLAGS+="-mips64"
##makeoptions CFLAGS+="-mips64"
Index: src/sys/arch/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.34 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.35
--- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.34 Fri Apr 29 08:26:18 2011
+++ src/sys/arch/evbmips/rmixl/machdep.c Thu May 26 19:24:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.2.34 2011/04/29 08:26:18 matt Exp $ */
+/* machdep.c,v 1.1.2.34 2011/04/29 08:26:18 matt Exp */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,9 +74,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.2.34 2011/04/29 08:26:18 matt Exp $");
+__KERNEL_RCSID(0, "machdep.c,v 1.1.2.34 2011/04/29 08:26:18 matt Exp");
#define __INTR_PRIVATE
+#define __MUTEX_PRIVATE
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@@ -423,6 +424,9 @@
__asm __volatile("dmtc0 %0,$%1"
:: "r"(&cpu_info_store), "n"(MIPS_COP_0_OSSCRATCH));
#ifdef MULTIPROCESSOR
+ __asm __volatile("dmtc0 %0,$%1,2"
+ :: "r"(&pmap_tlb0_info.ti_lock->mtx_lock),
+ "n"(MIPS_COP_0_OSSCRATCH));
mips_fixup_exceptions(rmixl_fixup_cop0_oscratch);
#endif
rmixl_fixup_curcpu();
