diff options
| author | jhb <jhb@FreeBSD.org> | 2005-11-21 20:22:35 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2005-11-21 20:22:35 +0000 |
| commit | 80adaaedab59e8fc3b6b8e747670177d2f64cb2a (patch) | |
| tree | c4cf12306454a553b07f10ccf7fafe795ca83949 | |
| parent | 23a1490fe0d92113b63777d239427f7107d9700e (diff) | |
| download | FreeBSD-src-80adaaedab59e8fc3b6b8e747670177d2f64cb2a.zip FreeBSD-src-80adaaedab59e8fc3b6b8e747670177d2f64cb2a.tar.gz | |
Don't enable PUC_FASTINTR by default in the source. Instead, enable it
via the DEFAULTS kernel configs. This allows folks to turn it that option
off in the kernel configs if desired without having to hack the source.
This is especially useful since PUC_FASTINTR hangs the kernel boot on my
ultra60 which has two uart(4) devices hung off of a puc(4) device.
I did not enable PUC_FASTINTR by default on powerpc since powerpc does not
currently allow sharing of INTR_FAST with non-INTR_FAST like the other
archs.
| -rw-r--r-- | sys/alpha/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/amd64/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/dev/puc/puc.c | 4 | ||||
| -rw-r--r-- | sys/i386/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/ia64/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/pc98/conf/DEFAULTS | 2 | ||||
| -rw-r--r-- | sys/sparc64/conf/DEFAULTS | 2 |
7 files changed, 12 insertions, 4 deletions
diff --git a/sys/alpha/conf/DEFAULTS b/sys/alpha/conf/DEFAULTS index c199be2..c1243a3 100644 --- a/sys/alpha/conf/DEFAULTS +++ b/sys/alpha/conf/DEFAULTS @@ -8,3 +8,5 @@ # Pseudo devices. device mem # Memory and kernel memory devices + +options PUC_FASTINTR diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index cf822b3..1464388 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -12,3 +12,5 @@ device isa # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +options PUC_FASTINTR diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index 696fcd2..0a51436 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -83,10 +83,6 @@ __FBSDID("$FreeBSD$"); #include "opt_puc.h" -#ifndef PUC_FASTINTR -#define PUC_FASTINTR -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 60cb04a..dff4e86 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -15,3 +15,5 @@ device npx # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +options PUC_FASTINTR diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS index 331061d..0250c0c 100644 --- a/sys/ia64/conf/DEFAULTS +++ b/sys/ia64/conf/DEFAULTS @@ -11,3 +11,5 @@ device acpi # ACPI support # Pseudo devices. device mem # Memory and kernel memory devices + +options PUC_FASTINTR diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS index bb0dab4..ba55008 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -16,3 +16,5 @@ device npx # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +options PUC_FASTINTR diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS index 087ee1d..442e01e 100644 --- a/sys/sparc64/conf/DEFAULTS +++ b/sys/sparc64/conf/DEFAULTS @@ -8,3 +8,5 @@ # Pseudo devices. device mem # Memory and kernel memory devices + +options PUC_FASTINTR |
