diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-05-10 23:33:58 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-05-10 23:33:58 +0000 |
| commit | 09a5d94c90070c7d817b768520d30a68ff2b4119 (patch) | |
| tree | 2f1f1942389a8cc3484f0ef892fa09cda64013b9 /sys | |
| parent | 53ad805dde2c0ae1cd4c4a320f720eec45b2ae4e (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/i386/userconfig.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 09f5b2f85c10..86ffd88f3fff 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.126.2.2 1999/02/06 10:02:15 yokota Exp $ + ** $Id: userconfig.c,v 1.126.2.3 1999/02/10 00:29:17 jkh Exp $ **/ /** @@ -994,11 +994,10 @@ findconflict(DEV_LIST *list) if ((dp->drq > 0) && /* drq conflict? */ (dp->drq == sp->drq)) dp->conflicts = 1; - if ((dp->maddr > 0) && /* maddr conflict? */ - (dp->maddr == sp->maddr)) - dp->conflicts = 1; - if ((dp->msize > 0) && /* msize conflict? */ - (dp->msize == sp->msize)) + if ((sp->maddr > 0) && /* maddr/msize conflict? */ + (dp->maddr > 0) && + (sp->maddr + ((sp->msize == 0) ? 1 : sp->msize) > dp->maddr) && + (dp->maddr + ((dp->msize == 0) ? 1 : dp->msize) > sp->maddr)) dp->conflicts = 1; } count += dp->conflicts; /* count conflicts */ @@ -2507,7 +2506,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.126.2.2 1999/02/06 10:02:15 yokota Exp $ + * $Id: userconfig.c,v 1.126.2.3 1999/02/10 00:29:17 jkh Exp $ */ #include "scbus.h" |