From: "Vadim Kuznetsov" <vadimk@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
Date: Sat, 1 Sep 2012 13:15:51 +0000 (UTC) [thread overview]
Message-ID: <1346505158.10b4b3b920e083941a3a2f571c895d9cb587e676.vadimk@gentoo> (raw)
commit: 10b4b3b920e083941a3a2f571c895d9cb587e676
Author: Billy DeVincentis <billydv1 <AT> verizon <DOT> net>
AuthorDate: Sat Sep 1 13:12:38 2012 +0000
Commit: Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 13:12:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10b4b3b9
Bug 432918
Author: Billy DeVincentis <billydv1 <AT> verizon.net>
new file: 271-vmmon.patch
---
app-emulation/vmware-modules/files/271-vmmon.patch | 44 ++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/app-emulation/vmware-modules/files/271-vmmon.patch b/app-emulation/vmware-modules/files/271-vmmon.patch
new file mode 100644
index 0000000..f197964
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-vmmon.patch
@@ -0,0 +1,44 @@
+diff -ru source900/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
+--- source900/vmmon-only/linux/hostif.c 2012-07-23 18:18:55.000000000 +0900
++++ source/vmmon-only/linux/hostif.c 2012-08-03 16:20:23.200420885 +0900
+@@ -48,6 +48,7 @@
+ #include <linux/smp_lock.h>
+ #endif
+
++#include <asm/asm.h>
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+ #include <linux/mc146818rtc.h>
+@@ -3586,31 +3587,14 @@
+ {
+ int ret;
+ unsigned low, high;
+-#if defined(VM_X86_64)
+ asm volatile("2: rdmsr ; xor %0,%0\n"
+ "1:\n\t"
+ ".section .fixup,\"ax\"\n\t"
+ "3: mov %4,%0 ; jmp 1b\n\t"
+ ".previous\n\t"
+- ".section __ex_table,\"a\"\n\t"
+- ".balign 8\n"
+- ".quad 2b,3b\n"
+- ".previous\n"
++ _ASM_EXTABLE(2b,3b)
+ : "=r"(ret), "=a"(low), "=d"(high)
+ : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
+-#else
+- asm volatile("2: rdmsr ; xor %0,%0\n"
+- "1:\n\t"
+- ".section .fixup,\"ax\"\n\t"
+- "3: mov %4,%0 ; jmp 1b\n\t"
+- ".previous\n\t"
+- ".section __ex_table,\"a\"\n"
+- ".balign 4\n"
+- ".long 2b,3b\n"
+- ".previous\n"
+- : "=r"(ret), "=a"(low), "=d"(high)
+- : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
+-#endif // VM_X86_64
+ *val = (low | ((u64)(high) << 32));
+
+ return ret;
next reply other threads:[~2012-09-01 13:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-01 13:15 Vadim Kuznetsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-10 13:55 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/ Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-14 1:59 Evan Teran
2014-10-14 2:08 Evan Teran
2014-10-14 2:28 Evan Teran
2015-05-05 17:10 Evan Teran
2015-07-14 2:01 Evan Teran
2016-05-27 23:11 Fabio Rossi
2016-08-05 7:29 Fabio Rossi
2016-08-17 12:38 Fabio Rossi
2016-08-17 12:38 Fabio Rossi
2017-06-25 21:43 Fabio Rossi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346505158.10b4b3b920e083941a3a2f571c895d9cb587e676.vadimk@gentoo \
--to=vadimk@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox