aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-07-24 12:44:22 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-07-24 12:44:22 +1000
commit619cd009abed20fca8c9aea2e4a804964465fac8 (patch)
tree4651b82948d9552dad2684525d5ba93bc0e309f3
parente9e4a410bf00b4c29e403e29852180287fe92a8f (diff)
parent15318a9f801558fb300347db6f96fb7c90ec915f (diff)
Merge remote-tracking branch 'audit/next'
-rw-r--r--kernel/audit.c2
-rw-r--r--kernel/auditsc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 6dd556931739..0cf15c77c5eb 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1662,7 +1662,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,
struct timespec64 *t, unsigned int *serial)
{
if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
- ktime_get_real_ts64(t);
+ *t = current_kernel_time64();
*serial = audit_serial();
}
}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 3260ba2312a9..fd72e11acfb2 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1536,7 +1536,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
return;
context->serial = 0;
- ktime_get_real_ts64(&context->ctime);
+ context->ctime = current_kernel_time64();
context->in_syscall = 1;
context->current_state = state;
context->ppid = 0;