Merge branch 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

99039e13 · Linus Torvalds <[email protected]> · 2008-09-02 11:04:47 -07:00

* 'audit.b57' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] audit: Moved variable declaration to beginning of function

Commit: 99039e1352fa451bd46e2c020dc78bcaf2a159d9
Parents: 72a8d129 · c4bacefb

Merge commit. Changes below are compared with the first parent: 72a8d129.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
kernel/auditsc.c	modified	+2	−1	View file

kernel/auditsc.c

View file

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 972f8e6..59cedfb 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask)
 
 static int audit_match_perm(struct audit_context *ctx, int mask)
 {
+	unsigned n;
 	if (unlikely(!ctx))
 		return 0;
 
-	unsigned n = ctx->major;
+	n = ctx->major;
 	switch (audit_classify_syscall(ctx->arch, n)) {
 	case 0:	/* native */
 		if ((mask & AUDIT_PERM_WRITE) &&