36e8f935a1
Drop upstreamed patch for gcc5 compatibility Forward port x32 patch (From OE-Core rev: 2782ae4dfb417ba377f861283792d7d9929f2ae3) (From OE-Core rev: 0d0a591fca9fadd786f0ccda05cd68c295d6bb21) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
26 lines
822 B
Diff
26 lines
822 B
Diff
When try to print time_t values as a long int it causes an error because time_t
|
|
data type in x32 ABI is long long int.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
|
|
|
|
Index: mdadm-3.3.4/monitor.c
|
|
===================================================================
|
|
--- mdadm-3.3.4.orig/monitor.c
|
|
+++ mdadm-3.3.4/monitor.c
|
|
@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar
|
|
mdi->curr_state = read_dev_state(mdi->state_fd);
|
|
}
|
|
}
|
|
-
|
|
gettimeofday(&tv, NULL);
|
|
+#if defined(__x86_64__) && defined(__ILP32__)
|
|
+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
|
|
+#else
|
|
dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
|
|
+#endif
|
|
a->info.container_member,
|
|
tv.tv_sec, tv.tv_usec,
|
|
array_states[a->curr_state],
|