summaryrefslogtreecommitdiffstats
path: root/sys/powerpc/aim
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-13 19:12:53 +0000
committerian <ian@FreeBSD.org>2014-05-13 19:12:53 +0000
commit8bff46167d01e2c564eaed05cb2d4ad8591c879d (patch)
tree6f247fb329332ebdffc3431607c7a9322b744d4c /sys/powerpc/aim
parent7d01a916d944df2168da8a3a096c4d6986b1fa3a (diff)
downloadFreeBSD-src-8bff46167d01e2c564eaed05cb2d4ad8591c879d.zip
FreeBSD-src-8bff46167d01e2c564eaed05cb2d4ad8591c879d.tar.gz
MFC r257162, r257175
The old trap.h (then trap_aim.h) actually had trap ID codes for Book-E CPUs. Use it universally. Book-E traps may also need revisiting due to the introduction of fixed-offset traps and the deprecation of IVORs in POWER ISA 2.06, but that's very much an issue for another day.
Diffstat (limited to 'sys/powerpc/aim')
-rw-r--r--sys/powerpc/aim/mmu_oea.c2
-rw-r--r--sys/powerpc/aim/mp_cpudep.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index a7f67e9..e9b3a44 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -141,7 +141,7 @@ __FBSDID("$FreeBSD$");
#include <machine/smp.h>
#include <machine/sr.h>
#include <machine/mmuvar.h>
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
#include "mmu_if.h"
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index 41d66e5..3bc21a4 100644
--- a/sys/powerpc/aim/mp_cpudep.c
+++ b/sys/powerpc/aim/mp_cpudep.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
#include <machine/smp.h>
#include <machine/spr.h>
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
#include <dev/ofw/openfirm.h>
#include <machine/ofw_machdep.h>
OpenPOWER on IntegriCloud