diff options
| author | hubertf <hubertf> | 2000-04-26 12:15:59 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-04-26 12:15:59 +0000 |
| commit | a066cdad71b741374a97b6591ccf72c31d36d079 (patch) | |
| tree | a603e6efdb3c8ea38ae4438968b6fe7718e023e9 /sysutils | |
| parent | 9bc310a8ca191ec422d95aa785ff83579816de46 (diff) | |
| download | pkgsrc-a066cdad71b741374a97b6591ccf72c31d36d079.tar.gz | |
Define rdmsr() etc. only for __NetBSD_Version__ < 104240000.
At least right now, they're clashing with the definitions in
cpufunc.h (as the comment in the file even said :-)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/aperture/files/patch-sum | 3 | ||||
| -rw-r--r-- | sysutils/aperture/patches/patch-ac | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/sysutils/aperture/files/patch-sum b/sysutils/aperture/files/patch-sum index 88aef9c8adf..2d59ea961db 100644 --- a/sysutils/aperture/files/patch-sum +++ b/sysutils/aperture/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/01/05 18:02:19 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/04/26 12:15:59 hubertf Exp $ MD5 (patch-aa) = 2eff82bf1a230de43a83a4cb4c96eba7 MD5 (patch-ab) = f45a6989db23e6019effe4683898d9c8 +MD5 (patch-ac) = bdef667d9a470fa0b1dd02d0098c786f diff --git a/sysutils/aperture/patches/patch-ac b/sysutils/aperture/patches/patch-ac new file mode 100644 index 00000000000..4764083eae7 --- /dev/null +++ b/sysutils/aperture/patches/patch-ac @@ -0,0 +1,20 @@ +$NetBSD: patch-ac,v 1.1 2000/04/26 12:16:00 hubertf Exp $ + +--- module/xf86_reg.h.orig Wed Apr 26 14:09:20 2000 ++++ module/xf86_reg.h Wed Apr 26 14:11:27 2000 +@@ -18,6 +18,7 @@ + #define MTRR_N16K 16 + #define MTRR_N4K 64 + ++#if (__NetBSD_Version__ < 104240000) + /* + * XXX - These belong to cpufunc.h + */ +@@ -41,6 +42,7 @@ + { + __asm __volatile(".byte 0x0f, 0x30" : : "A" (newval), "c" (msr)); + } ++#endif /* __NetBSD_Version__ */ + + #ifndef M_MEMDESC + #define M_MEMDESC M_TEMP /* XXX */ |