| 1 |
commit: 10b4b3b920e083941a3a2f571c895d9cb587e676 |
| 2 |
Author: Billy DeVincentis <billydv1 <AT> verizon <DOT> net> |
| 3 |
AuthorDate: Sat Sep 1 13:12:38 2012 +0000 |
| 4 |
Commit: Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 1 13:12:38 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10b4b3b9 |
| 7 |
|
| 8 |
Bug 432918 |
| 9 |
Author: Billy DeVincentis <billydv1 <AT> verizon.net> |
| 10 |
new file: 271-vmmon.patch |
| 11 |
|
| 12 |
--- |
| 13 |
app-emulation/vmware-modules/files/271-vmmon.patch | 44 ++++++++++++++++++++ |
| 14 |
1 files changed, 44 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/vmware-modules/files/271-vmmon.patch b/app-emulation/vmware-modules/files/271-vmmon.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..f197964 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-emulation/vmware-modules/files/271-vmmon.patch |
| 21 |
@@ -0,0 +1,44 @@ |
| 22 |
+diff -ru source900/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c |
| 23 |
+--- source900/vmmon-only/linux/hostif.c 2012-07-23 18:18:55.000000000 +0900 |
| 24 |
++++ source/vmmon-only/linux/hostif.c 2012-08-03 16:20:23.200420885 +0900 |
| 25 |
+@@ -48,6 +48,7 @@ |
| 26 |
+ #include <linux/smp_lock.h> |
| 27 |
+ #endif |
| 28 |
+ |
| 29 |
++#include <asm/asm.h> |
| 30 |
+ #include <asm/io.h> |
| 31 |
+ #include <asm/uaccess.h> |
| 32 |
+ #include <linux/mc146818rtc.h> |
| 33 |
+@@ -3586,31 +3587,14 @@ |
| 34 |
+ { |
| 35 |
+ int ret; |
| 36 |
+ unsigned low, high; |
| 37 |
+-#if defined(VM_X86_64) |
| 38 |
+ asm volatile("2: rdmsr ; xor %0,%0\n" |
| 39 |
+ "1:\n\t" |
| 40 |
+ ".section .fixup,\"ax\"\n\t" |
| 41 |
+ "3: mov %4,%0 ; jmp 1b\n\t" |
| 42 |
+ ".previous\n\t" |
| 43 |
+- ".section __ex_table,\"a\"\n\t" |
| 44 |
+- ".balign 8\n" |
| 45 |
+- ".quad 2b,3b\n" |
| 46 |
+- ".previous\n" |
| 47 |
++ _ASM_EXTABLE(2b,3b) |
| 48 |
+ : "=r"(ret), "=a"(low), "=d"(high) |
| 49 |
+ : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0 |
| 50 |
+-#else |
| 51 |
+- asm volatile("2: rdmsr ; xor %0,%0\n" |
| 52 |
+- "1:\n\t" |
| 53 |
+- ".section .fixup,\"ax\"\n\t" |
| 54 |
+- "3: mov %4,%0 ; jmp 1b\n\t" |
| 55 |
+- ".previous\n\t" |
| 56 |
+- ".section __ex_table,\"a\"\n" |
| 57 |
+- ".balign 4\n" |
| 58 |
+- ".long 2b,3b\n" |
| 59 |
+- ".previous\n" |
| 60 |
+- : "=r"(ret), "=a"(low), "=d"(high) |
| 61 |
+- : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0 |
| 62 |
+-#endif // VM_X86_64 |
| 63 |
+ *val = (low | ((u64)(high) << 32)); |
| 64 |
+ |
| 65 |
+ return ret; |
Archives