From 43bc536ba20519a15dc85c1f4f29bc96ddf74d3b Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Wed, 4 Jul 2001 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2001-07-04 --- pc/vgamach64xx.c | 2 +- pc/vgas3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc/vgamach64xx.c b/pc/vgamach64xx.c index bebdf33a46c82a8a34d1986341c206af0530f463..7a1e1dd407467f635d10b94ea40bea1bec42842e 100644 --- a/pc/vgamach64xx.c +++ b/pc/vgamach64xx.c @@ -126,7 +126,7 @@ mach64xxlinear(VGAscr* scr, int* size, int* align) scr->isupamem = 1; scr->mmio = KADDR(aperture+osize-0x400); - if(oaperture) + if(oaperture && oaperture != aperture) print("warning (BUG): redefinition of aperture does not change mach64mmio segment\n"); memset(&seg, 0, sizeof(seg)); seg.attr = SG_PHYSICAL; diff --git a/pc/vgas3.c b/pc/vgas3.c index b2b29c11c2e0f15b0855c81adda685c2dafeb3c7..a936d8f38dd1e0020b935b0ae34916e03c6a2bff 100644 --- a/pc/vgas3.c +++ b/pc/vgas3.c @@ -155,7 +155,7 @@ s3linear(VGAscr* scr, int* size, int* align) else scr->isupamem = 1; - if(oaperture) + if(oaperture && oaperture != aperture) print("warning (BUG): redefinition of aperture does not change s3screen segment\n"); memset(&seg, 0, sizeof(seg)); seg.attr = SG_PHYSICAL;