diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-11-19 20:08:39 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-11-19 20:08:39 -0200 |
commit | 66368e2767c6b888a7c06ad9f00ca36f5ac1d636 (patch) | |
tree | c7fbe15e3dc729e1bec52e0a4aa67b6b075a47e8 /kernels/xen/24345.patch | |
parent | 37489d59c329d34f8ad6645e8595b43ff8aec998 (diff) |
xen-4.2.0-12: updating version
Diffstat (limited to 'kernels/xen/24345.patch')
-rwxr-xr-x | kernels/xen/24345.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/kernels/xen/24345.patch b/kernels/xen/24345.patch deleted file mode 100755 index e75a1b38c..000000000 --- a/kernels/xen/24345.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/tools/misc/xen-detect.c 2011-10-20 15:05:43.000000000 -0200 -+++ b/tools/misc/xen-detect.c 2012-02-15 00:05:55.524455578 -0200 -@@ -35,18 +35,21 @@ - - static void cpuid(uint32_t idx, uint32_t *regs, int pv_context) - { -- asm volatile ( - #ifdef __i386__ --#define R(x) "%%e"#x"x" --#else --#define R(x) "%%r"#x"x" --#endif -- "push "R(a)"; push "R(b)"; push "R(c)"; push "R(d)"\n\t" -+/* Use the stack to avoid reg constraint failures with some gcc flags */ -+ asm volatile ( -+ "push %%eax; push %%ebx; push %%ecx; push %%edx\n\t" - "test %1,%1 ; jz 1f ; ud2a ; .ascii \"xen\" ; 1: cpuid\n\t" - "mov %%eax,(%2); mov %%ebx,4(%2)\n\t" - "mov %%ecx,8(%2); mov %%edx,12(%2)\n\t" -- "pop "R(d)"; pop "R(c)"; pop "R(b)"; pop "R(a)"\n\t" -+ "pop %%edx; pop %%ecx; pop %%ebx; pop %%eax\n\t" - : : "a" (idx), "c" (pv_context), "S" (regs) : "memory" ); -+#else -+ asm volatile ( -+ "test %5,%5 ; jz 1f ; ud2a ; .ascii \"xen\" ; 1: cpuid\n\t" -+ : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) -+ : "0" (idx), "1" (pv_context), "2" (0) ); -+#endif - } - - static int check_for_xen(int pv_context) |