Mon Jul 6 10:44:38 2020 UTC ()
Drop unused opt_lockdebug.h, opt_multiprocessor.h, and opt_ppcarch.h.


(rin)
diff -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/openbios/locore.S
cvs diff -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/openbios/locore.S (expand / switch to unified diff)

--- src/sys/arch/powerpc/ibm4xx/openbios/locore.S 2020/07/06 09:34:17 1.13
+++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S 2020/07/06 10:44:38 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.S,v 1.13 2020/07/06 09:34:17 rin Exp $ */ 1/* $NetBSD: locore.S,v 1.14 2020/07/06 10:44:38 rin Exp $ */
2/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ 2/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
3 3
4/* 4/*
5 * Copyright 2001 Wasabi Systems, Inc. 5 * Copyright 2001 Wasabi Systems, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc. 8 * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -64,30 +64,27 @@ @@ -64,30 +64,27 @@
64 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 64 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
65 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 65 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
66 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 66 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
67 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 67 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68 */ 68 */
69 69
70#undef PPC_4XX_NOCACHE 70#undef PPC_4XX_NOCACHE
71 71
72#include "assym.h" 72#include "assym.h"
73#include "ksyms.h" 73#include "ksyms.h"
74 74
75#ifdef _KERNEL_OPT 75#ifdef _KERNEL_OPT
76#include "opt_ddb.h" 76#include "opt_ddb.h"
77#include "opt_lockdebug.h" 
78#include "opt_modular.h" 77#include "opt_modular.h"
79#include "opt_multiprocessor.h" 
80#include "opt_ppcarch.h" 
81#include "opt_ppcparam.h" 78#include "opt_ppcparam.h"
82#endif 79#endif
83 80
84#include <sys/syscall.h> 81#include <sys/syscall.h>
85 82
86#include <machine/param.h> 83#include <machine/param.h>
87#include <machine/psl.h> 84#include <machine/psl.h>
88#include <machine/trap.h> 85#include <machine/trap.h>
89#include <machine/asm.h> 86#include <machine/asm.h>
90 87
91#include <powerpc/spr.h> 88#include <powerpc/spr.h>
92#include <powerpc/ibm4xx/spr.h> 89#include <powerpc/ibm4xx/spr.h>
93#include <powerpc/ibm4xx/dcr4xx.h> 90#include <powerpc/ibm4xx/dcr4xx.h>