From 3f0d4168e87cd3f712acc43c157e57f9cd422f74 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Fri, 29 Apr 2005 16:09:52 +0100
Subject: [PATCH] --- yaml --- r: 584 b: refs/heads/master c:
 d812ddbb89e323d054a7d073466225966c8350c8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/audit.h | 2 +-
 trunk/kernel/audit.c        | 6 ++++--
 trunk/kernel/auditsc.c      | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0f12e3dd017a..c3291bcdb9b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd6f58ba6efc82ea2c9c2630f7ff5ed9eeaf34a
+refs/heads/master: d812ddbb89e323d054a7d073466225966c8350c8
diff --git a/trunk/include/linux/audit.h b/trunk/include/linux/audit.h
index fad0c1dc21a9..0467f2441b68 100644
--- a/trunk/include/linux/audit.h
+++ b/trunk/include/linux/audit.h
@@ -186,7 +186,7 @@ extern void audit_inode(const char *name, const struct inode *inode);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
 				 void *data);
 extern void audit_get_stamp(struct audit_context *ctx,
-			    struct timespec *t, int *serial);
+			    struct timespec *t, unsigned int *serial);
 extern int  audit_set_loginuid(struct audit_context *ctx, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
 extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index e7bff8000d23..aa35422c0c42 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -620,7 +620,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
 	struct audit_buffer	*ab	= NULL;
 	unsigned long		flags;
 	struct timespec		t;
-	int			serial	= 0;
+	unsigned int		serial;
 
 	if (!audit_initialized)
 		return NULL;
@@ -669,8 +669,10 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
 		audit_get_stamp(ab->ctx, &t, &serial);
 	else
 #endif
+	{
 		t = CURRENT_TIME;
-
+		serial = 0;
+	}
 	audit_log_format(ab, "audit(%lu.%03lu:%u): ",
 			 t.tv_sec, t.tv_nsec/1000000, serial);
 	return ab;
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index 77e92592de57..49ecd707b953 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -992,7 +992,7 @@ void audit_inode(const char *name, const struct inode *inode)
 }
 
 void audit_get_stamp(struct audit_context *ctx,
-		     struct timespec *t, int *serial)
+		     struct timespec *t, unsigned int *serial)
 {
 	if (ctx) {
 		t->tv_sec  = ctx->ctime.tv_sec;