diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-10-07 21:56:40 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-10-07 21:56:40 +0000 |
| commit | 5a685db4b6c631ccd9a0d6da133fc709cf122d02 (patch) | |
| tree | 0cbc721255368cbe1e9df1da58112412a28e608c | |
| parent | 6cface431ba9d62dfc55cae72c98cc30c85db30a (diff) | |
PR 5005: On alpha, trust the PCI BARS from SRM. ok kettenis@, miod@.
| -rw-r--r-- | xserver/hw/xfree86/common/xf86Bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/common/xf86Bus.c b/xserver/hw/xfree86/common/xf86Bus.c index 0bc0b21cf..1ca93ca8d 100644 --- a/xserver/hw/xfree86/common/xf86Bus.c +++ b/xserver/hw/xfree86/common/xf86Bus.c @@ -1829,7 +1829,8 @@ xf86RegisterResources(int entityIndex, resList list, unsigned long access) range.type = (range.type & ~ResAccMask) | (access & ResAccMask); } range.type &= ~ResEstimated; /* Not allowed for drivers */ -#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux)) +#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux)) && \ + !(defined(__alpha__) && defined(__OpenBSD__)) /* On Alpha Linux, do not check for conflicts, trust the kernel. */ if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE)) res = xf86AddResToList(res,&range,entityIndex); @@ -2451,6 +2452,7 @@ xf86PostProbe(void) xf86FreeResList(acc); #if !(defined(__alpha__) && defined(linux)) && \ !(defined(__ia64__) && defined(linux)) && \ + !(defined(__alpha__) && defined(__OpenBSD__)) && \ !(defined(__sparc64__) && defined(__OpenBSD__)) /* * No need to validate on Alpha Linux or OpenBSD/sparc64, |