Fix build problem on NetBSD 4_STABLE which dosen't have _X86_SYSARCH_L()

cpp macro.
This commit is contained in:
taca 2011-05-09 14:06:46 +00:00
parent 5ed4e41bb2
commit 31b7fab1a5
2 changed files with 14 additions and 14 deletions

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.11 2011/05/07 10:06:34 shattered Exp $
$NetBSD: distinfo,v 1.12 2011/05/09 14:06:46 taca Exp $
SHA1 (libpciaccess-0.11.0.tar.bz2) = bcebba8b8441af151b59b63e8e91e66133b64158
RMD160 (libpciaccess-0.11.0.tar.bz2) = 7d579f024e543c97cceb47c204d395e4097becf2
Size (libpciaccess-0.11.0.tar.bz2) = 295639 bytes
SHA1 (patch-aa) = 6bb844c0696c8a86c6033605339e82da34164bdc
SHA1 (patch-ac) = c2df07d306203f3236e3a79caf4eedc5104d6f78
SHA1 (patch-ac) = c25114198e5fe55bcef60020ec9e898000a7a4be

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.8 2011/05/07 10:06:34 shattered Exp $
$NetBSD: patch-ac,v 1.9 2011/05/09 14:06:46 taca Exp $
--- src/netbsd_pci.c.orig 2009-02-17 00:10:20.000000000 +0000
+++ src/netbsd_pci.c
@ -19,18 +19,18 @@ $NetBSD: patch-ac,v 1.8 2011/05/07 10:06:34 shattered Exp $
+#ifdef HAVE_MTRR
#include <machine/sysarch.h>
#include <machine/mtrr.h>
+#ifdef _X86_SYSARCH_L
+#define netbsd_set_mtrr(mr, num) _X86_SYSARCH_L(set_mtrr)((mr), (num))
+#else
+#ifdef __i386__
+#define netbsd_set_mtrr(mr, num) i386_set_mtrr((mr), (num))
+#endif
+#ifdef __amd64__
+#define netbsd_set_mtrr(mr, num) x86_64_set_mtrr((mr), (num))
+#endif
+#endif
+#endif
+# ifdef _X86_SYSARCH_L
+# define netbsd_set_mtrr(mr, num) _X86_SYSARCH_L(set_mtrr)(mr, num)
+# else
+# ifdef i386
+# define netbsd_set_mtrr(mr, num) i386_set_mtrr((mr), (num))
+# elif amd64
+# define netbsd_set_mtrr(mr, num) x86_64_set_mtrr((mr), (num))
+# endif
+# endif
+#endif
+
+#include <dev/pci/pcidevs.h>
#include <dev/pci/pciio.h>
#include <dev/pci/pcireg.h>