diff options
| author |   kettenis <kettenis@openbsd.org> | 2010-06-27 21:00:22 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2010-06-27 21:00:22 +0000 |
| commit | c6bed5625b0f03ee58648048c017200ada290bb3 (patch) | |
| tree | 9c41b5447e749b68441a6b187ebd28043b5847c5 | |
| parent | Kill another #ifdef UBC chunk that was annoying me while doing something (diff) | |
| download | wireguard-openbsd-c6bed5625b0f03ee58648048c017200ada290bb3.tar.xz wireguard-openbsd-c6bed5625b0f03ee58648048c017200ada290bb3.zip | |
Disable uguru(4). Its probe touches an address used by something else on the
Dell r815, which causes all sorts of nasty effects like instant reboots, NMIs
and PCI BARs being set to zero.
ok dlg@
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index f52febfdf7c..f9853c899f8 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.289 2010/04/02 20:07:29 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.290 2010/06/27 21:00:22 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -95,8 +95,8 @@ viaenv* at pci? # VIA VT82C686A hardware monitor wbsio* at isa? port 0x2e # Winbond LPC Super I/O wbsio* at isa? port 0x4e -uguru0 at isa? port 0xe0 # ABIT uGuru lm* at wbsio? +uguru0 at isa? disable port 0xe0 # ABIT uGuru aps0 at isa? port 0x1600 # ThinkPad Active Protection System diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index dfc859ff4bd..a29f7dae1e6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.683 2010/04/02 20:07:28 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.684 2010/06/27 21:00:22 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -148,7 +148,7 @@ viasio* at isa? port 0x4e flags 0x0000 wbsio* at isa? port 0x2e # Winbond LPC Super I/O wbsio* at isa? port 0x4e lm* at wbsio? -uguru0 at isa? port 0xe0 # ABIT uGuru +uguru0 at isa? disable port 0xe0 # ABIT uGuru fins0 at isa? port 0x4e # Fintek F71805 Super I/O aps0 at isa? port 0x1600 # ThinkPad Active Protection System |