Module Name: src
Committed By: matt
Date: Fri Jan 7 01:37:43 UTC 2011
Modified Files:
src/sys/arch/bebox/bebox [matt-nb5-pq3]: locore.S
src/sys/arch/mvmeppc/mvmeppc [matt-nb5-pq3]: locore.S
src/sys/arch/mvmeppc/stand/libsa [matt-nb5-pq3]: srt0.S
src/sys/arch/sandpoint/sandpoint [matt-nb5-pq3]: locore.S
src/sys/arch/sandpoint/stand/netboot [matt-nb5-pq3]: entry.S
Log Message:
Deal with split <spr.h>
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.28.1 src/sys/arch/bebox/bebox/locore.S
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/mvmeppc/mvmeppc/locore.S
cvs rdiff -u -r1.2 -r1.2.24.1 src/sys/arch/mvmeppc/stand/libsa/srt0.S
cvs rdiff -u -r1.13 -r1.13.20.1 src/sys/arch/sandpoint/sandpoint/locore.S
cvs rdiff -u -r1.3 -r1.3.44.1 src/sys/arch/sandpoint/stand/netboot/entry.S
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/bebox/bebox/locore.S
diff -u src/sys/arch/bebox/bebox/locore.S:1.16 src/sys/arch/bebox/bebox/locore.S:1.16.28.1
--- src/sys/arch/bebox/bebox/locore.S:1.16 Tue Feb 5 22:31:48 2008
+++ src/sys/arch/bebox/bebox/locore.S Fri Jan 7 01:37:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.16 2008/02/05 22:31:48 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.16.28.1 2011/01/07 01:37:43 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -52,6 +52,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
/*
* Some instructions gas doesn't understand (yet?)
Index: src/sys/arch/mvmeppc/mvmeppc/locore.S
diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.7 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.7.28.1
--- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.7 Tue Feb 5 22:31:49 2008
+++ src/sys/arch/mvmeppc/mvmeppc/locore.S Fri Jan 7 01:37:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.7 2008/02/05 22:31:49 garbled Exp $ */
+/* $NetBSD: locore.S,v 1.7.28.1 2011/01/07 01:37:43 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -51,6 +51,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include "ksyms.h"
Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S
diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2.24.1
--- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Fri Jan 7 01:37:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: srt0.S,v 1.2 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: srt0.S,v 1.2.24.1 2011/01/07 01:37:43 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
#include <machine/asm.h>
#include <machine/psl.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#define STACK_SIZE 8192
Index: src/sys/arch/sandpoint/sandpoint/locore.S
diff -u src/sys/arch/sandpoint/sandpoint/locore.S:1.13 src/sys/arch/sandpoint/sandpoint/locore.S:1.13.20.1
--- src/sys/arch/sandpoint/sandpoint/locore.S:1.13 Sat Apr 19 02:01:03 2008
+++ src/sys/arch/sandpoint/sandpoint/locore.S Fri Jan 7 01:37:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.13 2008/04/19 02:01:03 nisimura Exp $ */
+/* $NetBSD: locore.S,v 1.13.20.1 2011/01/07 01:37:43 matt Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -51,6 +51,7 @@
#include <machine/asm.h>
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/hid.h>
#include "ksyms.h"
Index: src/sys/arch/sandpoint/stand/netboot/entry.S
diff -u src/sys/arch/sandpoint/stand/netboot/entry.S:1.3 src/sys/arch/sandpoint/stand/netboot/entry.S:1.3.44.1
--- src/sys/arch/sandpoint/stand/netboot/entry.S:1.3 Mon Nov 5 13:41:48 2007
+++ src/sys/arch/sandpoint/stand/netboot/entry.S Fri Jan 7 01:37:43 2011
@@ -1,6 +1,7 @@
-/* $NetBSD: entry.S,v 1.3 2007/11/05 13:41:48 nisimura Exp $ */
+/* $NetBSD: entry.S,v 1.3.44.1 2011/01/07 01:37:43 matt Exp $ */
#include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
#include <powerpc/oea/hid.h>
.text
