summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-04-20 12:54:20 -0400
committerMike Frysinger <vapier@gentoo.org>2016-04-20 13:02:27 -0400
commitbdf8faba8b5aef6c2710ec2b6a43a419ff3d6b64 (patch)
tree22f124c190a5a7414962360a08f4d91ed0dd9fc1 /sys-block/fio/files
parentsys-kernel/gentoo-sources: Linux patch 4.4.8 (diff)
downloadgentoo-bdf8faba8b5aef6c2710ec2b6a43a419ff3d6b64.tar.gz
gentoo-bdf8faba8b5aef6c2710ec2b6a43a419ff3d6b64.tar.bz2
gentoo-bdf8faba8b5aef6c2710ec2b6a43a419ff3d6b64.zip
sys-block/fio: drop old <2.2.9 versions
Diffstat (limited to 'sys-block/fio/files')
-rw-r--r--sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch29
-rw-r--r--sys-block/fio/files/fio-2.1.10-json.patch32
2 files changed, 0 insertions, 61 deletions
diff --git a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
deleted file mode 100644
index fa35e27c754e..000000000000
--- a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar fio-2.0.14.orig/arch/arch-x86-common.h fio-2.0.14/arch/arch-x86-common.h
---- fio-2.0.14.orig/arch/arch-x86-common.h 2013-02-21 18:12:32.000000000 +0000
-+++ fio-2.0.14/arch/arch-x86-common.h 2013-03-27 01:48:04.000000000 +0000
-@@ -6,10 +6,24 @@
- static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
- unsigned int *ecx, unsigned int *edx)
- {
-+#ifdef __PIC__
-+ /* 32-bit Hardened GCC (PIC) uses register EBX, so it must be preserved
-+ * Fix ported from Gentoo's x86info-1.24-pic patch
-+ * http://tuxion.com/2010/07/02/clobber-registers.html */
-+ asm volatile(
-+ "movl %%ebx,%%edi\n"
-+ "cpuid\n"
-+ "movl %%ebx,%1\n"
-+ "movl %%edi,%%ebx\n"
-+ : "=a" (*eax), "=m" (*ebx), "=c" (*ecx), "=d" (*edx)
-+ : "0" (*eax), "2" (*ecx)
-+ : "memory", "%edi");
-+#else
- asm volatile("cpuid"
- : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
- : "0" (*eax), "2" (*ecx)
- : "memory");
-+#endif
- }
-
- static inline void cpuid(unsigned int op,
-
diff --git a/sys-block/fio/files/fio-2.1.10-json.patch b/sys-block/fio/files/fio-2.1.10-json.patch
deleted file mode 100644
index 526be9b76228..000000000000
--- a/sys-block/fio/files/fio-2.1.10-json.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a606a802173272002e37be6475802be8c37481d6 Mon Sep 17 00:00:00 2001
-From: Puthikorn Voravootivat <puthik@chromium.org>
-Date: Tue, 24 Jun 2014 15:59:53 -0700
-Subject: [PATCH] Cast input argument for json_object_add_value_int to long
- long
-
-The latency related (and some other) variables type is uint32_t
-but the JSON integer type is long long. So we need to cast
-the numbers to long long type to make JSON output correctly.
-
-Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
-Signed-off-by: Jens Axboe <axboe@fb.com>
----
- json.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/json.h b/json.h
-index 081afd6..962c11c 100644
---- a/json.h
-+++ b/json.h
-@@ -52,7 +52,7 @@ void json_free_object(struct json_object *obj);
-
- int json_object_add_value_type(struct json_object *obj, const char *name, int type, ...);
- #define json_object_add_value_int(obj, name, val) \
-- json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (val))
-+ json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (long long) (val))
- #define json_object_add_value_float(obj, name, val) \
- json_object_add_value_type((obj), name, JSON_TYPE_FLOAT, (val))
- #define json_object_add_value_string(obj, name, val) \
---
-2.0.0
-