Module Name: src
Committed By: nonaka
Date: Mon Jan 5 07:40:05 UTC 2015
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c e500_intr.c
Log Message:
Initialize lock objects.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.18 src/sys/arch/powerpc/booke/booke_pmap.c:1.19
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.18 Tue Mar 18 18:20:41 2014
+++ src/sys/arch/powerpc/booke/booke_pmap.c Mon Jan 5 07:40:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.18 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.19 2015/01/05 07:40:05 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.18 2014/03/18 18:20:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.19 2015/01/05 07:40:05 nonaka Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -167,6 +167,9 @@ pmap_bootstrap(vaddr_t startkernel, vadd
KASSERT(endkernel == trunc_page(endkernel));
+ /* init the lock */
+ pmap_tlb_info_init(&pmap_tlb0_info);
+
/*
* Compute the number of pages kmem_arena will have.
*/
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.28 src/sys/arch/powerpc/booke/e500_intr.c:1.29
--- src/sys/arch/powerpc/booke/e500_intr.c:1.28 Sat Dec 27 16:19:33 2014
+++ src/sys/arch/powerpc/booke/e500_intr.c Mon Jan 5 07:40:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.28 2014/12/27 16:19:33 nonaka Exp $ */
+/* $NetBSD: e500_intr.c,v 1.29 2015/01/05 07:40:05 nonaka Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.28 2014/12/27 16:19:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.29 2015/01/05 07:40:05 nonaka Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1095,6 +1095,11 @@ e500_intr_init(void)
}
/*
+ * Initialize interrupt handler lock
+ */
+ mutex_init(&e500_intr_lock, MUTEX_DEFAULT, IPL_HIGH);
+
+ /*
* We need to be in mixed mode.
*/
openpic_write(cpu, OPENPIC_GCR, GCR_M);
