diff --git a/kernel/audit.h b/kernel/audit.h
index 1918019e6aaf..3b9c0945225a 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -191,10 +191,6 @@ struct audit_context {
 		struct {
 			char			*name;
 		} module;
-		struct {
-			struct audit_ntp_data	ntp_data;
-			struct timespec64	tk_injoffset;
-		} time;
 	};
 	int fds[2];
 	struct audit_proctitle proctitle;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 07e2788bbbf1..638f424859ed 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1214,53 +1214,6 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)
 			 from_kuid(&init_user_ns, name->fcap.rootid));
 }
 
-static void audit_log_time(struct audit_context *context, struct audit_buffer **ab)
-{
-	const struct audit_ntp_data *ntp = &context->time.ntp_data;
-	const struct timespec64 *tk = &context->time.tk_injoffset;
-	static const char * const ntp_name[] = {
-		"offset",
-		"freq",
-		"status",
-		"tai",
-		"tick",
-		"adjust",
-	};
-	int type;
-
-	if (context->type == AUDIT_TIME_ADJNTPVAL) {
-		for (type = 0; type < AUDIT_NTP_NVALS; type++) {
-			if (ntp->vals[type].newval != ntp->vals[type].oldval) {
-				if (!*ab) {
-					*ab = audit_log_start(context,
-							GFP_KERNEL,
-							AUDIT_TIME_ADJNTPVAL);
-					if (!*ab)
-						return;
-				}
-				audit_log_format(*ab, "op=%s old=%lli new=%lli",
-						 ntp_name[type],
-						 ntp->vals[type].oldval,
-						 ntp->vals[type].newval);
-				audit_log_end(*ab);
-				*ab = NULL;
-			}
-		}
-	}
-	if (tk->tv_sec != 0 || tk->tv_nsec != 0) {
-		if (!*ab) {
-			*ab = audit_log_start(context, GFP_KERNEL,
-					      AUDIT_TIME_INJOFFSET);
-			if (!*ab)
-				return;
-		}
-		audit_log_format(*ab, "sec=%lli nsec=%li",
-				 (long long)tk->tv_sec, tk->tv_nsec);
-		audit_log_end(*ab);
-		*ab = NULL;
-	}
-}
-
 static void show_special(struct audit_context *context, int *call_panic)
 {
 	struct audit_buffer *ab;
@@ -1366,11 +1319,6 @@ static void show_special(struct audit_context *context, int *call_panic)
 			audit_log_format(ab, "(null)");
 
 		break;
-	case AUDIT_TIME_ADJNTPVAL:
-	case AUDIT_TIME_INJOFFSET:
-		/* this call deviates from the rest, eating the buffer */
-		audit_log_time(context, &ab);
-		break;
 	}
 	audit_log_end(ab);
 }
@@ -2612,26 +2560,31 @@ void __audit_fanotify(unsigned int response)
 
 void __audit_tk_injoffset(struct timespec64 offset)
 {
-	struct audit_context *context = audit_context();
+	audit_log(audit_context(), GFP_KERNEL, AUDIT_TIME_INJOFFSET,
+		  "sec=%lli nsec=%li",
+		  (long long)offset.tv_sec, offset.tv_nsec);
+}
 
-	/* only set type if not already set by NTP */
-	if (!context->type)
-		context->type = AUDIT_TIME_INJOFFSET;
-	memcpy(&context->time.tk_injoffset, &offset, sizeof(offset));
+static void audit_log_ntp_val(const struct audit_ntp_data *ad,
+			      const char *op, enum audit_ntp_type type)
+{
+	const struct audit_ntp_val *val = &ad->vals[type];
+
+	if (val->newval == val->oldval)
+		return;
+
+	audit_log(audit_context(), GFP_KERNEL, AUDIT_TIME_ADJNTPVAL,
+		  "op=%s old=%lli new=%lli", op, val->oldval, val->newval);
 }
 
 void __audit_ntp_log(const struct audit_ntp_data *ad)
 {
-	struct audit_context *context = audit_context();
-	int type;
-
-	for (type = 0; type < AUDIT_NTP_NVALS; type++)
-		if (ad->vals[type].newval != ad->vals[type].oldval) {
-			/* unconditionally set type, overwriting TK */
-			context->type = AUDIT_TIME_ADJNTPVAL;
-			memcpy(&context->time.ntp_data, ad, sizeof(*ad));
-			break;
-		}
+	audit_log_ntp_val(ad, "offset",	AUDIT_NTP_OFFSET);
+	audit_log_ntp_val(ad, "freq",	AUDIT_NTP_FREQ);
+	audit_log_ntp_val(ad, "status",	AUDIT_NTP_STATUS);
+	audit_log_ntp_val(ad, "tai",	AUDIT_NTP_TAI);
+	audit_log_ntp_val(ad, "tick",	AUDIT_NTP_TICK);
+	audit_log_ntp_val(ad, "adjust",	AUDIT_NTP_ADJUST);
 }
 
 void __audit_log_nfcfg(const char *name, u8 af, unsigned int nentries,