From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Eric Paris <eparis@redhat.com>
Subject: Re: linux-next: Tree for July 1 (fix CONFIG_AUDIT_WATCH=n build)
Date: Wed, 1 Jul 2009 15:06:14 +0200 [thread overview]
Message-ID: <200907011506.16145.bzolnier@gmail.com> (raw)
In-Reply-To: <20090701183903.bd203c62.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2009-07-01 13:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-01 8:39 linux-next: Tree for July 1 Stephen Rothwell
2009-07-01 13:06 ` Bartlomiej Zolnierkiewicz [this message]
2009-07-01 13:06 ` linux-next: Tree for July 1 (fix CONFIG_AUDIT_WATCH=n build) Eric Paris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200907011506.16145.bzolnier@gmail.com \
--to=bzolnier@gmail.com \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.