summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch')
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch23
1 files changed, 11 insertions, 12 deletions
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index 143a8d952e..c656d073e3 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -5,22 +5,21 @@ Upstream-Status: Pending
5 5
6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 6Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
7 7
8diff --git a/monitor.c b/monitor.c 8Index: mdadm-3.3.4/monitor.c
9index f81e707..19ea041 100644 9===================================================================
10--- a/monitor.c 10--- mdadm-3.3.4.orig/monitor.c
11+++ b/monitor.c 11+++ mdadm-3.3.4/monitor.c
12@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a) 12@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar
13 mdi->curr_state = read_dev_state(mdi->state_fd);
14 }
13 } 15 }
14 16-
15 gettimeofday(&tv, NULL); 17 gettimeofday(&tv, NULL);
16+#if defined(__x86_64__) && defined(__ILP32__) 18+#if defined(__x86_64__) && defined(__ILP32__)
17+ dprintf("%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", 19+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
18+#else 20+#else
19 dprintf("%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", 21 dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
20- __func__, a->info.container_member,
21+#endif 22+#endif
22+ __func__, 23 a->info.container_member,
23+ a->info.container_member,
24 tv.tv_sec, tv.tv_usec, 24 tv.tv_sec, tv.tv_usec,
25 array_states[a->curr_state], 25 array_states[a->curr_state],
26 array_states[a->prev_state],