diff options
| author |   gwk <gwk@openbsd.org> | 2006-10-27 10:42:39 +0000 |
|---|---|---|
| committer | gwk <gwk@openbsd.org> | 2006-10-27 10:42:39 +0000 |
| commit | 0e4a72be4fe4ed60f236e00e16dbca05b44c2c37 (patch) | |
| tree | 2a1f6d0f347579b84bd4656d3861ffc440d8cd84 | |
| parent | Add ioapic(4). (diff) | |
| download | wireguard-openbsd-0e4a72be4fe4ed60f236e00e16dbca05b44c2c37.tar.xz wireguard-openbsd-0e4a72be4fe4ed60f236e00e16dbca05b44c2c37.zip | |
Partially revert 1.33 the range calculation change for bandit
unfourtunately breaks some machines found the hard way by xsa@ and
mbalmer@.
ok mbalmer@
| -rw-r--r-- | sys/arch/macppc/pci/mpcpcibus.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c index 9b197680914..fbb64566608 100644 --- a/sys/arch/macppc/pci/mpcpcibus.c +++ b/sys/arch/macppc/pci/mpcpcibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibus.c,v 1.33 2006/10/23 02:05:26 gwk Exp $ */ +/* $OpenBSD: mpcpcibus.c,v 1.34 2006/10/27 10:42:39 gwk Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -218,10 +218,7 @@ mpcpcibus_find_ranges_32 (struct pcibr_softc *sc, u_int32_t *range_store, if (base != 0) { if ((base + size) == prange[i].base) size += prange[i].size; - else if (prange[i].base < base) { - size+= base - prange[i].base; - base = prange[i].base; - } else { + else { size = prange[i].size; base = prange[i].base; } |