Sat Apr 2 08:16:54 2016 UTC ()
appease compiler. Fixes options MODULAR build.


(mlelstv)
diff -r1.245 -r1.246 src/sys/arch/amiga/amiga/machdep.c
cvs diff -r1.245 -r1.246 src/sys/arch/amiga/amiga/machdep.c (expand / switch to unified diff)

--- src/sys/arch/amiga/amiga/machdep.c 2015/06/13 07:35:50 1.245
+++ src/sys/arch/amiga/amiga/machdep.c 2016/04/02 08:16:54 1.246
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: machdep.c,v 1.245 2015/06/13 07:35:50 mlelstv Exp $ */ 1/* $NetBSD: machdep.c,v 1.246 2016/04/02 08:16:54 mlelstv Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988 University of Utah. 4 * Copyright (c) 1988 University of Utah.
5 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. 5 * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * the Systems Programming Group of the University of Utah Computer 9 * the Systems Programming Group of the University of Utah Computer
10 * Science Department. 10 * Science Department.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -40,27 +40,27 @@ @@ -40,27 +40,27 @@
40 40
41#include "opt_ddb.h" 41#include "opt_ddb.h"
42#include "opt_compat_netbsd.h" 42#include "opt_compat_netbsd.h"
43#include "opt_fpu_emulate.h" 43#include "opt_fpu_emulate.h"
44#include "opt_lev6_defer.h" 44#include "opt_lev6_defer.h"
45#include "opt_m060sp.h" 45#include "opt_m060sp.h"
46#include "opt_modular.h" 46#include "opt_modular.h"
47#include "opt_panicbutton.h" 47#include "opt_panicbutton.h"
48#include "opt_m68k_arch.h" 48#include "opt_m68k_arch.h"
49 49
50#include "empm.h" 50#include "empm.h"
51 51
52#include <sys/cdefs.h> 52#include <sys/cdefs.h>
53__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.245 2015/06/13 07:35:50 mlelstv Exp $"); 53__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.246 2016/04/02 08:16:54 mlelstv Exp $");
54 54
55#include <sys/param.h> 55#include <sys/param.h>
56#include <sys/systm.h> 56#include <sys/systm.h>
57#include <sys/callout.h> 57#include <sys/callout.h>
58#include <sys/signalvar.h> 58#include <sys/signalvar.h>
59#include <sys/kernel.h> 59#include <sys/kernel.h>
60#include <sys/proc.h> 60#include <sys/proc.h>
61#include <sys/buf.h> 61#include <sys/buf.h>
62#include <sys/reboot.h> 62#include <sys/reboot.h>
63#include <sys/conf.h> 63#include <sys/conf.h>
64#include <sys/file.h> 64#include <sys/file.h>
65#include <sys/malloc.h> 65#include <sys/malloc.h>
66#include <sys/mbuf.h> 66#include <sys/mbuf.h>
@@ -1198,41 +1198,41 @@ cpu_exec_aout_makecmds(struct lwp *l, st @@ -1198,41 +1198,41 @@ cpu_exec_aout_makecmds(struct lwp *l, st
1198#ifdef MODULAR 1198#ifdef MODULAR
1199/* 1199/*
1200 * Push any modules loaded by the bootloader etc. 1200 * Push any modules loaded by the bootloader etc.
1201 */ 1201 */
1202void 1202void
1203module_init_md(void) 1203module_init_md(void)
1204{ 1204{
1205} 1205}
1206 1206
1207int _spllkm6(void); 1207int _spllkm6(void);
1208int _spllkm7(void); 1208int _spllkm7(void);
1209 1209
1210#ifdef LEV6_DEFER 1210#ifdef LEV6_DEFER
1211int _spllkm6() { 1211int _spllkm6(void) {
1212 return spl4(); 1212 return spl4();
1213}; 1213};
1214 1214
1215int _spllkm7() { 1215int _spllkm7(void) {
1216 return spl4(); 1216 return spl4();
1217}; 1217};
1218 1218
1219#else 1219#else
1220 1220
1221int _spllkm6() { 1221int _spllkm6(void) {
1222 return spl6(); 1222 return spl6();
1223}; 1223};
1224 1224
1225int _spllkm7() { 1225int _spllkm7(void) {
1226 return spl7(); 1226 return spl7();
1227}; 1227};
1228 1228
1229#endif 1229#endif
1230 1230
1231#endif 1231#endif
1232 1232
1233int ipl2spl_table[_NIPL] = { 1233int ipl2spl_table[_NIPL] = {
1234 [IPL_NONE] = PSL_IPL0|PSL_S, 1234 [IPL_NONE] = PSL_IPL0|PSL_S,
1235 [IPL_SOFTCLOCK] = PSL_IPL1|PSL_S, 1235 [IPL_SOFTCLOCK] = PSL_IPL1|PSL_S,
1236 [IPL_VM] = PSL_IPL4|PSL_S, 1236 [IPL_VM] = PSL_IPL4|PSL_S,
1237#if defined(LEV6_DEFER) 1237#if defined(LEV6_DEFER)
1238 [IPL_SCHED] = PSL_IPL4|PSL_S, 1238 [IPL_SCHED] = PSL_IPL4|PSL_S,