|
@@ -1638,10 +1638,10 @@ unsigned int audit_serial(void)
|
|
|
}
|
|
|
|
|
|
static inline void audit_get_stamp(struct audit_context *ctx,
|
|
|
- struct timespec *t, unsigned int *serial)
|
|
|
+ struct timespec64 *t, unsigned int *serial)
|
|
|
{
|
|
|
if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
|
|
|
- *t = CURRENT_TIME;
|
|
|
+ ktime_get_real_ts64(t);
|
|
|
*serial = audit_serial();
|
|
|
}
|
|
|
}
|
|
@@ -1665,7 +1665,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
|
|
|
int type)
|
|
|
{
|
|
|
struct audit_buffer *ab;
|
|
|
- struct timespec t;
|
|
|
+ struct timespec64 t;
|
|
|
unsigned int uninitialized_var(serial);
|
|
|
|
|
|
if (audit_initialized != AUDIT_INITIALIZED)
|
|
@@ -1718,8 +1718,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
|
|
|
}
|
|
|
|
|
|
audit_get_stamp(ab->ctx, &t, &serial);
|
|
|
- audit_log_format(ab, "audit(%lu.%03lu:%u): ",
|
|
|
- t.tv_sec, t.tv_nsec/1000000, serial);
|
|
|
+ audit_log_format(ab, "audit(%llu.%03lu:%u): ",
|
|
|
+ (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial);
|
|
|
|
|
|
return ab;
|
|
|
}
|