These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / s390 / kernel / debug.c

diff --git a/kernel/arch/s390/kernel/debug.c b/kernel/arch/s390/kernel/debug.c
index c1f21ac..6fca0e4 100644 (file)
--- a/kernel/arch/s390/kernel/debug.c
+++ b/kernel/arch/s390/kernel/debug.c
@@ -1457,23 +1457,24 @@ int
 debug_dflt_header_fn(debug_info_t * id, struct debug_view *view,
                         int area, debug_entry_t * entry, char *out_buf)
 {
-       struct timespec time_spec;
+       struct timespec64 time_spec;
        char *except_str;
        unsigned long caller;
        int rc = 0;
        unsigned int level;
 
        level = entry->id.fields.level;
-       stck_to_timespec(entry->id.stck, &time_spec);
+       stck_to_timespec64(entry->id.stck, &time_spec);
 
        if (entry->id.fields.exception)
                except_str = "*";
        else
                except_str = "-";
        caller = ((unsigned long) entry->caller) & PSW_ADDR_INSN;
-       rc += sprintf(out_buf, "%02i %011lu:%06lu %1u %1s %02i %p  ",
-                     area, time_spec.tv_sec, time_spec.tv_nsec / 1000, level,
-                     except_str, entry->id.fields.cpuid, (void *) caller);
+       rc += sprintf(out_buf, "%02i %011lld:%06lu %1u %1s %02i %p  ",
+                     area, (long long)time_spec.tv_sec,
+                     time_spec.tv_nsec / 1000, level, except_str,
+                     entry->id.fields.cpuid, (void *)caller);
        return rc;
 }
 EXPORT_SYMBOL(debug_dflt_header_fn);