diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
commit | 6f102d1647580e0bb9513c124b26a64c77da4f15 (patch) | |
tree | 0340f1f588be251183fe2b251bdba778f2c85c22 /kernels/xen/24344.patch | |
parent | 433900b14f11dc9ee55b72e8e5946bf47f65b636 (diff) | |
parent | b6cb10de275cea63bab0bee2a98342afa4fdc4ee (diff) | |
download | abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.gz abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.bz2 abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'kernels/xen/24344.patch')
-rwxr-xr-x | kernels/xen/24344.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/kernels/xen/24344.patch b/kernels/xen/24344.patch deleted file mode 100755 index 642b90867..000000000 --- a/kernels/xen/24344.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/tools/libxc/xc_cpuid_x86.c 2011-10-20 15:05:42.000000000 -0200 -+++ b/tools/libxc/xc_cpuid_x86.c 2012-02-15 00:01:46.307514813 -0200 -@@ -42,23 +42,23 @@ - static void cpuid(const unsigned int *input, unsigned int *regs) - { - unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1]; -- asm ( - #ifdef __i386__ -+/* Use the stack to avoid reg constraint failures with some gcc flags */ -+ asm ( - "push %%ebx; push %%edx\n\t" --#else -- "push %%rbx; push %%rdx\n\t" --#endif - "cpuid\n\t" - "mov %%ebx,4(%4)\n\t" - "mov %%edx,12(%4)\n\t" --#ifdef __i386__ - "pop %%edx; pop %%ebx\n\t" -+ : "=a" (regs[0]), "=c" (regs[2]) -+ : "0" (input[0]), "1" (count), "S" (regs) -+ : "memory" ); - #else -- "pop %%rdx; pop %%rbx\n\t" -+ asm ( -+ "cpuid" -+ : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) -+ : "0" (input[0]), "2" (count) ); - #endif -- : "=a" (regs[0]), "=c" (regs[2]) -- : "0" (input[0]), "1" (count), "S" (regs) -- : "memory" ); - } |