Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/ibm4xx Now, ctx_flush() never fails. So, ma...



details:   https://anonhg.NetBSD.org/src/rev/e08b79933c9b
branches:  trunk
changeset: 985718:e08b79933c9b
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Sep 05 12:47:10 2021 +0000

description:
Now, ctx_flush() never fails. So, make this function void.

diffstat:

 sys/arch/powerpc/ibm4xx/pmap.c |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r ce26a09c99f6 -r e08b79933c9b sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Sun Sep 05 12:45:44 2021 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Sun Sep 05 12:47:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.103 2021/09/05 12:28:44 rin Exp $   */
+/*     $NetBSD: pmap.c,v 1.104 2021/09/05 12:47:10 rin Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2021/09/05 12:28:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.104 2021/09/05 12:47:10 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -183,7 +183,7 @@
 
 static int pmap_initialized;
 
-static int ctx_flush(int);
+static void ctx_flush(int);
 
 struct pv_entry *pa_to_pv(paddr_t);
 static inline char *pa_to_attr(paddr_t);
@@ -1560,7 +1560,7 @@
 /*
  * Flush all the entries matching a context from the TLB.
  */
-static int
+static void
 ctx_flush(int cnum)
 {
        int i;
@@ -1579,7 +1579,6 @@
                        tlb_invalidate_entry(i);
                }
        }
-       return 0;
 }
 
 /*
@@ -1605,15 +1604,9 @@
        } while (ctxbusy[cnum] != NULL && cnum != next);
 
        /* Now clean it out */
-oops:
        if (cnum < MINCTX)
                cnum = MINCTX; /* Never steal ctx 0 or 1 */
-       if (ctx_flush(cnum)) {
-               /* oops -- something's wired. */
-               if (++cnum >= NUMCTX)
-                       cnum = MINCTX;
-               goto oops;
-       }
+       ctx_flush(cnum);
 
        if (ctxbusy[cnum]) {
 #ifdef DEBUG



Home | Main Index | Thread Index | Old Index