Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide #include <m68k/softintr.h> inside #ifdef _KERNEL in <machine/intr.h> 

to avoid exporting unnecessary files to userland.
Should fix build.sh failure, which was pointed out by isaki@.

XXX: which userland program would require contents of <machine/intr.h>?
This commit is contained in:
tsutsui 2007-03-04 05:28:38 +00:00
parent 25640dc740
commit 1b20cebad5
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/hp300/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.20 2007/03/04 01:57:21 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.21 2007/03/04 05:28:38 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@ -136,6 +136,8 @@ struct hp300_intr {
struct evcnt hi_evcnt;
};
#include <m68k/softintr.h>
/* locore.s */
int spl0(void);
@ -148,6 +150,4 @@ void intr_printlevels(void);
#endif /* _KERNEL */
#include <m68k/softintr.h>
#endif /* _HP300_INTR_H_ */

5
sys/arch/luna68k/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.7 2007/03/04 02:23:16 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.8 2007/03/04 05:28:38 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -102,8 +102,9 @@ splraiseipl(ipl_cookie_t icookie)
return _splraise(icookie._spl);
}
#endif /* _KERNEL */
#include <m68k/softintr.h>
#endif /* _KERNEL */
#endif /* _MACHINE_INTR_H */

13
sys/arch/m68k/include/softintr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: softintr.h,v 1.1 2007/03/04 01:54:04 tsutsui Exp $ */
/* $NetBSD: softintr.h,v 1.2 2007/03/04 05:28:38 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@ -39,6 +39,10 @@
#ifndef _M68K_SOFTINTR_H_
#define _M68K_SOFTINTR_H_
#include <sys/device.h>
#include <sys/queue.h>
#include <machine/psl.h>
#define SI_SOFTSERIAL 0 /* serial software interrupts */
#define SI_SOFTNET 1 /* network software interrupts */
#define SI_SOFTCLOCK 2 /* clock software interrupts */
@ -53,11 +57,6 @@
"misc", \
}
#ifdef _KERNEL
#include <sys/device.h>
#include <sys/queue.h>
#include <machine/psl.h>
struct m68k_soft_intrhand {
LIST_ENTRY(m68k_soft_intrhand) sih_q;
struct m68k_soft_intr *sih_intrhead;
@ -91,6 +90,4 @@ do { \
extern struct m68k_soft_intrhand *softnet_intrhand;
#define setsoftnet() softintr_schedule(softnet_intrhand)
#endif /* _KERNEL */
#endif /* _M68K_SOFTINTR_H_ */

6
sys/arch/x68k/include/intr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.13 2007/03/04 02:08:09 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.14 2007/03/04 05:28:38 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -98,8 +98,8 @@ splraiseipl(ipl_cookie_t icookie)
return _splraise(icookie._psl);
}
#endif /* _KERNEL && ! _LOCORE */
#include <m68k/softintr.h>
#endif /* _KERNEL && ! _LOCORE */
#endif /* !_X68K_INTR_H_ */