Re: linux-next: Tree for July 1 (fix CONFIG_AUDIT_WATCH=n build)

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

Hi,

On Wednesday 01 July 2009 10:39:03 Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20090630:

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] audit: fix CONFIG_AUDIT_WATCH=n build

Fix:

kernel/auditfilter.c: In function ‘audit_data_to_entry’:
kernel/auditfilter.c:501: error: expected expression before ‘{’ token
kernel/auditfilter.c: In function ‘audit_add_rule’:
kernel/auditfilter.c:891: error: expected expression before ‘{’ token
make[1]: *** [kernel/auditfilter.o] Error 1
make: *** [kernel/auditfilter.o] Error 2

introduced by commit de85e5bc3690c3063aea790279e898adb5bac0ba
("Audit: split audit watch Kconfig").

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
BTW defines are passé (using static inlines instead for CONFIG_AUDIT=n
and CONFIG_AUDIT_WATCH=n stuff would be an even better solution)..

 kernel/audit.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: b/kernel/audit.h
===================================================================
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -117,12 +117,11 @@ extern int audit_watch_compare(struct au
 #else
 #define audit_put_watch(w) {}
 #define audit_get_watch(w) {}
-#define audit_to_watch(k, p, l, o) { -EINVAL }
-#define audit_add_watch(k, l) { -EINVAL }
+#define audit_to_watch(k, p, l, o) (-EINVAL)
+#define audit_add_watch(k, l) (-EINVAL)
 #define audit_remove_watch_rule(k) BUG()
 #define audit_watch_path(w) ""
 #define audit_watch_compare(w, i, d) 0
-
 #endif /* CONFIG_AUDIT_WATCH */
 
 #ifdef CONFIG_AUDIT_TREE