From: "Dan Horák" <dan@danny.cz>
To: trinity@vger.kernel.org
Subject: [PATCH] load correct syscall table for s390 and s390x
Date: Sat, 1 Feb 2014 11:12:04 +0100 [thread overview]
Message-ID: <1391249524-5384-1-git-send-email-dan@danny.cz> (raw)
The actual syscall table for s390/s390x must be loaded depending on
the __s390x__ symbol.
building on s390 (32=bit) ends with
...
In file included from /builddir/build/BUILD/trinity-1.3/include/arch.h:27:0,
from tables.c:10:
tables.c: In function 'select_syscall_tables':
/builddir/build/BUILD/trinity-1.3/include/arch-s390.h:24:18: error: 'syscalls_s390x' undeclared (first use in this function)
#define SYSCALLS syscalls_s390x
^
tables.c:347:32: note: in expansion of macro 'SYSCALLS'
syscalls = copy_syscall_table(SYSCALLS, ARRAY_SIZE(SYSCALLS));
^
/builddir/build/BUILD/trinity-1.3/include/arch-s390.h:24:18: note: each undeclared identifier is reported only once for each function it appears in
#define SYSCALLS syscalls_s390x
^
tables.c:347:32: note: in expansion of macro 'SYSCALLS'
syscalls = copy_syscall_table(SYSCALLS, ARRAY_SIZE(SYSCALLS));
^
make: *** [tables.o] Error 1
---
include/arch-s390.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/arch-s390.h b/include/arch-s390.h
index 030b4cf..c322030 100644
--- a/include/arch-s390.h
+++ b/include/arch-s390.h
@@ -8,6 +8,8 @@
#define PAGE_SHIFT 12
#define PTE_FILE_MAX_BITS 59
+#define SYSCALLS syscalls_s390x
+
#else /* __s390x__ */
#define KERNEL_ADDR 0UL
@@ -15,6 +17,8 @@
#define PAGE_SHIFT 12
#define PTE_FILE_MAX_BITS 26
+#define SYSCALLS syscalls_s390
+
#endif /* __s390x__ */
#define PAGE_OFFSET 0x0UL
@@ -22,5 +26,3 @@
#define PTRACE_GETFPREGS 0
#define PTRACE_SETREGS 0
#define PTRACE_SETFPREGS 0
-
-#define SYSCALLS syscalls_s390x
--
1.8.1.4
next reply other threads:[~2014-02-01 10:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-01 10:12 Dan Horák [this message]
2014-02-01 10:49 ` [PATCH] load correct syscall table for s390 and s390x Dan Horák
2014-02-01 15:29 ` Dave Jones
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=1391249524-5384-1-git-send-email-dan@danny.cz \
--to=dan@danny.cz \
--cc=trinity@vger.kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).