Skip to content

Commit 8e44188

Browse files
committed
intrcompat: replace many interrupt header includes with <machine/interrupt.h>
Referencing anything other than the fully compatible header is risky. Many of these will be expected to break due to lacking later compatibility adjustments. Avoid direct #include of headers besides <machine/interrupt.h>. Add #include <sys/types.h> to <sys/interrupt.h>. All current architectures need this header, this is very likely to apply to any architecture added to FreeBSD. Differential Revision: https://reviews.freebsd.org/D35559
1 parent a210886 commit 8e44188

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+77
-71
lines changed

sys/amd64/amd64/kexec_support.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <sys/systm.h>
2929
#include <sys/bus.h>
3030
#include <sys/conf.h>
31-
#include <sys/interrupt.h>
3231
#include <sys/kernel.h>
3332
#include <sys/kexec.h>
3433
#include <vm/vm.h>

sys/amd64/pt/pt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include <sys/systm.h>
4545
#include <sys/bus.h>
4646
#include <sys/hwt.h>
47-
#include <sys/interrupt.h>
4847
#include <sys/kernel.h>
4948
#include <sys/lock.h>
5049
#include <sys/malloc.h>
@@ -58,6 +57,7 @@
5857
#include <machine/atomic.h>
5958
#include <machine/cpufunc.h>
6059
#include <machine/fpu.h>
60+
#include <machine/interrupt.h>
6161
#include <machine/smp.h>
6262
#include <machine/specialreg.h>
6363

sys/arm/arm/busdma_machdep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include <sys/bus.h>
3939
#include <sys/busdma_bufalloc.h>
4040
#include <sys/counter.h>
41-
#include <sys/interrupt.h>
4241
#include <sys/kernel.h>
4342
#include <sys/ktr.h>
4443
#include <sys/lock.h>
@@ -59,6 +58,7 @@
5958
#include <machine/atomic.h>
6059
#include <machine/bus.h>
6160
#include <machine/cpu.h>
61+
#include <machine/interrupt.h>
6262
#include <machine/md_var.h>
6363

6464
//#define ARM_BUSDMA_MAPLOAD_STATS

sys/arm/arm/nexus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include <sys/param.h>
4343
#include <sys/systm.h>
4444
#include <sys/bus.h>
45-
#include <sys/interrupt.h>
4645
#include <sys/kernel.h>
4746
#include <sys/malloc.h>
4847
#include <sys/module.h>

sys/arm/broadcom/bcm2835/bcm2835_gpio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <sys/systm.h>
3535
#include <sys/bus.h>
3636
#include <sys/gpio.h>
37-
#include <sys/interrupt.h>
3837
#include <sys/kernel.h>
3938
#include <sys/lock.h>
4039
#include <sys/module.h>

sys/arm/mv/gpio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <sys/bus.h>
3737
#include <sys/kernel.h>
3838
#include <sys/lock.h>
39-
#include <sys/interrupt.h>
4039
#include <sys/module.h>
4140
#include <sys/malloc.h>
4241
#include <sys/mutex.h>

sys/arm64/arm64/busdma_bounce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <sys/domainset.h>
3737
#include <sys/malloc.h>
3838
#include <sys/bus.h>
39-
#include <sys/interrupt.h>
4039
#include <sys/kernel.h>
4140
#include <sys/ktr.h>
4241
#include <sys/lock.h>
@@ -55,6 +54,7 @@
5554

5655
#include <machine/atomic.h>
5756
#include <machine/bus.h>
57+
#include <machine/interrupt.h>
5858
#include <machine/md_var.h>
5959
#include <arm64/include/bus_dma_impl.h>
6060

sys/arm64/arm64/gic_v3.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include <sys/lock.h>
4848
#include <sys/mutex.h>
4949
#include <sys/smp.h>
50-
#include <sys/interrupt.h>
5150

5251
#include <vm/vm.h>
5352
#include <vm/pmap.h>

sys/arm64/arm64/nexus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include <sys/param.h>
4444
#include <sys/systm.h>
4545
#include <sys/bus.h>
46-
#include <sys/interrupt.h>
4746
#include <sys/kernel.h>
4847
#include <sys/malloc.h>
4948
#include <sys/module.h>

sys/cam/mmc/mmc_xpt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <sys/time.h>
3737
#include <sys/conf.h>
3838
#include <sys/fcntl.h>
39-
#include <sys/interrupt.h>
4039
#include <sys/sbuf.h>
4140
#include <sys/stdarg.h>
4241

@@ -60,6 +59,7 @@
6059
#include <cam/mmc/mmc_bus.h>
6160

6261
#include <machine/_inttypes.h> /* for PRIu64 */
62+
#include <machine/interrupt.h>
6363

6464
FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack");
6565

0 commit comments

Comments
 (0)