From 388e3c13210d69129631068c67cfa50e3519c1c9 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 23 Sep 2006 00:10:18 +0100
Subject: [PATCH] --- yaml --- r: 34346 b: refs/heads/master c:
 a83fbf635992442edf6aa3252e4008d4a08edf12 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/include/asm-generic/audit_change_attr.h | 4 ++++
 trunk/include/asm-generic/audit_dir_write.h   | 4 ++++
 trunk/lib/audit.c                             | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 04a3962d43ba..4ba5a291b705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db392219c5f572610645696e3672f6ea38783a65
+refs/heads/master: a83fbf635992442edf6aa3252e4008d4a08edf12
diff --git a/trunk/include/asm-generic/audit_change_attr.h b/trunk/include/asm-generic/audit_change_attr.h
index cb05bf69745a..50764550a60c 100644
--- a/trunk/include/asm-generic/audit_change_attr.h
+++ b/trunk/include/asm-generic/audit_change_attr.h
@@ -1,16 +1,20 @@
 __NR_chmod,
 __NR_fchmod,
+#ifdef __NR_chown
 __NR_chown,
 __NR_fchown,
 __NR_lchown,
+#endif
 __NR_setxattr,
 __NR_lsetxattr,
 __NR_fsetxattr,
 __NR_removexattr,
 __NR_lremovexattr,
 __NR_fremovexattr,
+#ifdef __NR_fchownat
 __NR_fchownat,
 __NR_fchmodat,
+#endif
 #ifdef __NR_chown32
 __NR_chown32,
 __NR_fchown32,
diff --git a/trunk/include/asm-generic/audit_dir_write.h b/trunk/include/asm-generic/audit_dir_write.h
index 161a7a58fbab..6621bd82cbe8 100644
--- a/trunk/include/asm-generic/audit_dir_write.h
+++ b/trunk/include/asm-generic/audit_dir_write.h
@@ -1,14 +1,18 @@
 __NR_rename,
 __NR_mkdir,
 __NR_rmdir,
+#ifdef __NR_creat
 __NR_creat,
+#endif
 __NR_link,
 __NR_unlink,
 __NR_symlink,
 __NR_mknod,
+#ifdef __NR_mkdirat
 __NR_mkdirat,
 __NR_mknodat,
 __NR_unlinkat,
 __NR_renameat,
 __NR_linkat,
 __NR_symlinkat,
+#endif
diff --git a/trunk/lib/audit.c b/trunk/lib/audit.c
index 8c21625ef938..3b1289fadf06 100644
--- a/trunk/lib/audit.c
+++ b/trunk/lib/audit.c
@@ -28,8 +28,10 @@ int audit_classify_syscall(int abi, unsigned syscall)
 	switch(syscall) {
 	case __NR_open:
 		return 2;
+#ifdef __NR_openat
 	case __NR_openat:
 		return 3;
+#endif
 #ifdef __NR_socketcall
 	case __NR_socketcall:
 		return 4;