diff options
| author | wiz <wiz@pkgsrc.org> | 2002-11-06 00:13:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-11-06 00:13:16 +0000 |
| commit | 1a0e1b882c938b1b562fd65e83c17c3ea1e59840 (patch) | |
| tree | e5bb84ffe9fc00c5a51b89fabf21598df5443791 /emulators/vmware-module | |
| parent | 8537928c2ed2b9116ae58cccf069694949c1ce7c (diff) | |
| download | pkgsrc-1a0e1b882c938b1b562fd65e83c17c3ea1e59840.tar.gz | |
Add #ifdef around definition of MSR_TSC, which conflicts with the definition
from machine/specialreg.h since the MP merge (but they have the same value).
Noted by Juergen Hannken-Illjes in PR 18540.
Diffstat (limited to 'emulators/vmware-module')
| -rw-r--r-- | emulators/vmware-module/distinfo | 3 | ||||
| -rw-r--r-- | emulators/vmware-module/patches/patch-aj | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo index 48b26fcb543..d5275caa169 100644 --- a/emulators/vmware-module/distinfo +++ b/emulators/vmware-module/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/10/02 05:28:36 uebayasi Exp $ +$NetBSD: distinfo,v 1.4 2002/11/06 00:13:17 wiz Exp $ SHA1 (vmware-netbsd-1.0.tgz) = ea3ec59de0bab2ecd57aedbff0ade54f88f84ae2 Size (vmware-netbsd-1.0.tgz) = 93286 bytes @@ -11,3 +11,4 @@ SHA1 (patch-af) = f9a5d00028faa5d30a9a19cd92b18eb825327aeb SHA1 (patch-ag) = 14dd7c64d9c0644f1173110b4330e39553ca806f SHA1 (patch-ah) = 9c0fb3cefb0fc971b4eaeaf6a6ec2f458fe837f7 SHA1 (patch-ai) = c3ef59e2c749d3eb910996eeae3c7785653a8f92 +SHA1 (patch-aj) = 7f5a85570e6527d95eb06697831ced8db70c1ca1 diff --git a/emulators/vmware-module/patches/patch-aj b/emulators/vmware-module/patches/patch-aj new file mode 100644 index 00000000000..fcef97d65bf --- /dev/null +++ b/emulators/vmware-module/patches/patch-aj @@ -0,0 +1,14 @@ +$NetBSD: patch-aj,v 1.1 2002/11/06 00:13:16 wiz Exp $ + +--- source/vmmon/include/x86.h.orig Thu Nov 30 13:37:01 2000 ++++ source/vmmon/include/x86.h +@@ -176,7 +176,9 @@ + #define CPUID_FAMILY_P5 5 + #define CPUID_FAMILY_P6 6 + ++#ifndef MSR_TSC + #define MSR_TSC 0x00000010 ++#endif /* MSR_TSC */ + #define MSR_MTRR_CAP 0x000000fe + #define MSR_SYSENTER_CS 0x00000174 + #define MSR_SYSENTER_ESP 0x00000175 |