CVS commit: [netbsd-7] src/sys/arch/powerpc/booke
Module Name:src
Committed By: martin
Date: Sat Feb 21 18:18:33 UTC 2015
Modified Files:
src/sys/arch/powerpc/booke [netbsd-7]: e500_tlb.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #535):
sys/arch/powerpc/booke/e500_tlb.c: revision 1.17
fix compile failure without DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/powerpc/booke/e500_tlb.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/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.13 src/sys/arch/powerpc/booke/e500_tlb.c:1.13.4.1
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.13 Mon Dec 9 09:35:16 2013
+++ src/sys/arch/powerpc/booke/e500_tlb.c Sat Feb 21 18:18:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.13 2013/12/09 09:35:16 wiz Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.13.4.1 2015/02/21 18:18:33 martin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: e500_tlb.c,v 1.13 2013/12/09 09:35:16 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: e500_tlb.c,v 1.13.4.1 2015/02/21 18:18:33 martin Exp $);
#include sys/param.h
@@ -766,7 +766,7 @@ e500_tlb_ioreserve(vaddr_t va, vsize_t l
KASSERT(((pte PTE_RPN_MASK) (len - 1)) == 0);
if ((xtlb = e500_tlb_lookup_xtlb2(va, len)) != NULL) {
- psize_t mask = ~(xtlb-e_tlb.tlb_size - 1);
+ psize_t mask __diagused = ~(xtlb-e_tlb.tlb_size - 1);
KASSERT(len = xtlb-e_tlb.tlb_size);
KASSERT((pte mask) == (xtlb-e_tlb.tlb_pte mask));
xtlb-e_refcnt++;
CVS commit: [netbsd-7] src/sys/arch/powerpc/booke
Module Name:src Committed By: martin Date: Mon Jan 26 16:18:42 UTC 2015 Modified Files: src/sys/arch/powerpc/booke [netbsd-7]: e500_timer.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #456): sys/arch/powerpc/booke/e500_timer.c: revision 1.6 fix build failure with lockstat. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/powerpc/booke/e500_timer.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/e500_timer.c diff -u src/sys/arch/powerpc/booke/e500_timer.c:1.5 src/sys/arch/powerpc/booke/e500_timer.c:1.5.2.1 --- src/sys/arch/powerpc/booke/e500_timer.c:1.5 Tue Jul 29 23:35:00 2014 +++ src/sys/arch/powerpc/booke/e500_timer.c Mon Jan 26 16:18:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: e500_timer.c,v 1.5 2014/07/29 23:35:00 joerg Exp $ */ +/* $NetBSD: e500_timer.c,v 1.5.2.1 2015/01/26 16:18:42 martin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: e500_timer.c,v 1.5 2014/07/29 23:35:00 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: e500_timer.c,v 1.5.2.1 2015/01/26 16:18:42 martin Exp $); #include sys/param.h #include sys/kernel.h @@ -53,6 +53,7 @@ __KERNEL_RCSID(0, $NetBSD: e500_timer.c #include powerpc/booke/e500var.h #include powerpc/booke/openpicreg.h +uint32_t ticks_per_sec; static u_long ns_per_tick; static void init_ppcbooke_tc(void); @@ -173,6 +174,7 @@ calc_delayconst(void) struct cpu_info * const ci = curcpu(); ci-ci_data.cpu_cc_freq = board_info_get_number(timebase-frequency); + ticks_per_sec = (uint32_t)ci-ci_data.cpu_cc_freq; ns_per_tick = 10 / (u_int)ci-ci_data.cpu_cc_freq; }
