frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 2750: Prevent mtrr_remove_offending from ending up in an endless loop 

if the offending region refuses to be removed.
This commit is contained in:
Thomas Hellstrom 2005-05-15 17:45:47 +00:00
parent f58a54668b
commit a90af4a2e6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -249,16 +249,15 @@ mtrr_remove_offending(int screenNum, unsigned long base, unsigned long size,
wcr = &wcreturn; wcr = &wcreturn;
for (gent.regnum = 0; for (gent.regnum = 0;
ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0;) { ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++ ) {
if (gent.type == MTRR_TYPE_WRCOMB if (gent.type == MTRR_TYPE_WRCOMB
&& ((gent.base >= base && gent.base + gent.size < base + size) || && ((gent.base >= base && gent.base + gent.size < base + size) ||
(gent.base > base && gent.base + gent.size <= base + size))) { (gent.base > base && gent.base + gent.size <= base + size))) {
*wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from); *wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from);
if (*wcr) gent.regnum--;
while(*wcr) { while(*wcr) {
wcr = &((*wcr)->next); wcr = &((*wcr)->next);
} }
} else {
gent.regnum++;
} }
} }
return wcreturn; return wcreturn;