From: Chris Metcalf <cmetcalf@tilera.com>
To: <linux-kernel@vger.kernel.org>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Eric Paris <eparis@redhat.com>
Subject: [PATCH] compat_audit: allow it to work without asm/unistd32.h
Date: Thu, 20 Mar 2014 11:31:55 -0400 [thread overview]
Message-ID: <201403201730.s2KHUVpf005157@farm-0039.internal.tilera.com> (raw)
For architectures that use the asm-generic syscall table for both
32- and 64-bit, there should be no need to provide a separate
<asm/unistd32.h>; just using <linux/unistd.h> is sufficient.
Conditionalize use of <asm/unistd32.h> on the one platform that
currently requires it (arm64). If another platform ends up needing
it we can create a suitable config flag at that point.
This change fixes the tilegx build failure seen in linux-next.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
By the way - I also note that commit 223b24d807610 that introduced
this also put an "#ifdef COMPAT_xxx" in a UAPI header. This seems
like a pretty clear signal that the added code should be in
linux/include/audit.h, not linux/uapi/include/audit.h. But here
I'm just focussing on getting tilegx to continue to build...
lib/compat_audit.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/compat_audit.c b/lib/compat_audit.c
index 873f75b640ab..e89a84b3fbe8 100644
--- a/lib/compat_audit.c
+++ b/lib/compat_audit.c
@@ -1,6 +1,11 @@
#include <linux/init.h>
#include <linux/types.h>
-#include <asm/unistd32.h>
+#ifdef COMPAT_ARM64
+/* 64-bit syscalls are generic, but 32-bit are not. */
+# include <asm/unistd32.h>
+#else
+# include <linux/unistd.h>
+#endif
unsigned compat_dir_class[] = {
#include <asm-generic/audit_dir_write.h>
--
1.8.3.1
next reply other threads:[~2014-03-20 17:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 15:31 Chris Metcalf [this message]
2014-03-24 16:21 ` Eric Paris
2014-03-24 16:39 ` Chris Metcalf
2014-03-25 2:16 ` AKASHI Takahiro
2014-03-25 13:25 ` Chris Metcalf
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=201403201730.s2KHUVpf005157@farm-0039.internal.tilera.com \
--to=cmetcalf@tilera.com \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=takahiro.akashi@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®