Move ifdef CONFIG_AUDITSYSCALL to header

Remove code conditionally dependent on CONFIG_AUDITSYSCALL from audit.c.
Move these dependencies to audit.h with the rest.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

2 files changed, 5 insertions, 14 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index dc4aba21f30a..c18b769e23a2 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -416,12 +416,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                         return -EINVAL;
                 /* fallthrough */
         case AUDIT_LIST:
-#ifdef CONFIG_AUDITSYSCALL
                 err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
                                            uid, seq, data, loginuid);
-#else
-                err = -EOPNOTSUPP;
-#endif
                 break;
         case AUDIT_SIGNAL_INFO:
                 sig_data.uid = audit_sig_uid;
@@ -636,15 +632,11 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx)
                 return NULL;
         }
 
-#ifdef CONFIG_AUDITSYSCALL
-        if (ab->ctx)
-                audit_get_stamp(ab->ctx, &t, &serial);
-        else
-#endif
-        {
+        if (!audit_get_stamp(ab->ctx, &t, &serial)) {
                 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/kernel/auditsc.c b/kernel/auditsc.c
index 680bb928343b..94338abf76f5 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -992,7 +992,7 @@ void audit_inode(const char *name, const struct inode *inode)
         context->names[idx].rdev = inode->i_rdev;
 }
 
-void audit_get_stamp(struct audit_context *ctx,
+int audit_get_stamp(struct audit_context *ctx,
                      struct timespec *t, unsigned int *serial)
 {
         if (ctx) {
@@ -1000,10 +1000,9 @@ void audit_get_stamp(struct audit_context *ctx,
                 t->tv_nsec = ctx->ctime.tv_nsec;
                 *serial    = ctx->serial;
                 ctx->auditable = 1;
-        } else {
-                *t      = CURRENT_TIME;
-                *serial = 0;
+                return 1;
         }
+        return 0;
 }
 
 extern int audit_set_type(struct audit_buffer *ab, int type);