[src/trunk]: src/sys/arch/powerpc/ibm4xx Convert mi_userret(9) into powerpc-s...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/edc05bed14fe
branches:  trunk
changeset: 744984:edc05bed14fe
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Feb 20 05:57:49 2020 +0000

description:
Convert mi_userret(9) into powerpc-specific userret().

This is necessary in order to support RAS.

There are some sanity checks in userret() as well.

diffstat:

 sys/arch/powerpc/ibm4xx/trap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r f981170d8815 -r edc05bed14fe sys/arch/powerpc/ibm4xx/trap.c
--- a/sys/arch/powerpc/ibm4xx/trap.c    Thu Feb 20 05:55:24 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap.c    Thu Feb 20 05:57:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.72 2020/02/20 05:55:24 rin Exp $    */
+/*     $NetBSD: trap.c,v 1.73 2020/02/20 05:57:49 rin Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.72 2020/02/20 05:55:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.73 2020/02/20 05:57:49 rin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -82,7 +82,6 @@
 #include <sys/reboot.h>
 #include <sys/syscall.h>
 #include <sys/systm.h>
-#include <sys/userret.h>
 
 #if defined(KGDB)
 #include <sys/kgdb.h>
@@ -97,6 +96,7 @@
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
+#include <powerpc/userret.h>
 
 #include <powerpc/db_machdep.h>
 #include <powerpc/spr.h>
@@ -348,8 +348,8 @@
                panic("trap");
        }
 
-       /* Invoke MI userret code */
-       mi_userret(l);
+       /* Invoke powerpc userret code */
+       userret(l, tf);
 }
 
 int