From: blaisorblade_spam@yahoo.it
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, jdike@addtoit.com,
user-mode-linux-devel@lists.sourceforge.net,
blaisorblade_spam@yahoo.it
Subject: [uml-devel] [patch 02/11] uml: fix compilation for missing headers
Date: Thu, 13 Jan 2005 22:00:51 +0100 [thread overview]
Message-ID: <20050113210051.99326AB30@zion> (raw)
Readd some needed headers inclusion deleted in
http://linux.bkbits.net:8080/linux-2.5/cset@41e49628dGbOWX-bT9yZII4f19GT6A
If you think it cannot make sense to include both <sys/ptrace.h> and
<linux/ptrace.h> (as userspace process, i.e. host includes), go complaining
with glibc, or follow the linux-abi includes idea.
However, the compilation failure is possibly glibc-version (or better glibc
includes version) related - what I now is that the failure happens on my
system with a glibc 2.3.4 (from Gentoo).
Also, remove some syscalls from the syscall table, since some syscalls were
added which are only inside -mm currently, and this prevents currently
compilation.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---
linux-2.6.11-paolo/arch/um/kernel/process.c | 4 ++++
linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff -puN arch/um/kernel/process.c~uml-fix-compilation-for-missing-headers arch/um/kernel/process.c
--- linux-2.6.11/arch/um/kernel/process.c~uml-fix-compilation-for-missing-headers 2005-01-13 19:57:51.000000000 +0100
+++ linux-2.6.11-paolo/arch/um/kernel/process.c 2005-01-13 19:59:30.000000000 +0100
@@ -13,6 +13,10 @@
#include <setjmp.h>
#include <sys/time.h>
#include <sys/ptrace.h>
+
+/*Userspace header, must be after sys/ptrace.h, and both must be included. */
+#include <linux/ptrace.h>
+
#include <sys/wait.h>
#include <sys/mman.h>
#include <asm/unistd.h>
diff -puN arch/um/kernel/sys_call_table.c~uml-fix-compilation-for-missing-headers arch/um/kernel/sys_call_table.c
--- linux-2.6.11/arch/um/kernel/sys_call_table.c~uml-fix-compilation-for-missing-headers 2005-01-13 20:48:02.000000000 +0100
+++ linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c 2005-01-13 21:17:23.866866296 +0100
@@ -20,7 +20,11 @@
#define NFSSERVCTL sys_ni_syscall
#endif
+#if 0
#define LAST_GENERIC_SYSCALL __NR_vperfctr_read
+#else
+#define LAST_GENERIC_SYSCALL __NR_keyctl
+#endif
#if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
#define LAST_SYSCALL LAST_GENERIC_SYSCALL
@@ -54,11 +58,14 @@ extern syscall_handler_t sys_get_mempoli
extern syscall_handler_t sys_set_mempolicy;
extern syscall_handler_t sys_sys_kexec_load;
extern syscall_handler_t sys_sys_setaltroot;
+
+#if 0
extern syscall_handler_t sys_vperfctr_open;
extern syscall_handler_t sys_vperfctr_control;
extern syscall_handler_t sys_vperfctr_unlink;
extern syscall_handler_t sys_vperfctr_iresume;
extern syscall_handler_t sys_vperfctr_read;
+#endif
syscall_handler_t *sys_call_table[] = {
[ __NR_restart_syscall ] = (syscall_handler_t *) sys_restart_syscall,
@@ -273,7 +280,10 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_mq_timedreceive ] = (syscall_handler_t *) sys_mq_timedreceive,
[ __NR_mq_notify ] = (syscall_handler_t *) sys_mq_notify,
[ __NR_mq_getsetattr ] = (syscall_handler_t *) sys_mq_getsetattr,
+#if 0
[ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_kexec_load,
+#endif
+ [ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
[ __NR_waitid ] = (syscall_handler_t *) sys_waitid,
#if 0
[ __NR_sys_setaltroot ] = (syscall_handler_t *) sys_sys_setaltroot,
@@ -281,11 +291,14 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
[ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
[ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
+ /* These syscalls are still in -mm only*/
+#if 0
[ __NR_vperfctr_open ] = (syscall_handler_t *) sys_vperfctr_open,
[ __NR_vperfctr_control ] = (syscall_handler_t *) sys_vperfctr_control,
[ __NR_vperfctr_unlink ] = (syscall_handler_t *) sys_vperfctr_unlink,
[ __NR_vperfctr_iresume ] = (syscall_handler_t *) sys_vperfctr_iresume,
[ __NR_vperfctr_read ] = (syscall_handler_t *) sys_vperfctr_read,
+#endif
ARCH_SYSCALLS
[ LAST_SYSCALL + 1 ... NR_syscalls ] =
_
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
WARNING: multiple messages have this Message-ID (diff)
From: blaisorblade_spam@yahoo.it
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, jdike@addtoit.com,
user-mode-linux-devel@lists.sourceforge.net,
blaisorblade_spam@yahoo.it
Subject: [patch 02/11] uml: fix compilation for missing headers
Date: Thu, 13 Jan 2005 22:00:51 +0100 [thread overview]
Message-ID: <20050113210051.99326AB30@zion> (raw)
Readd some needed headers inclusion deleted in
http://linux.bkbits.net:8080/linux-2.5/cset@41e49628dGbOWX-bT9yZII4f19GT6A
If you think it cannot make sense to include both <sys/ptrace.h> and
<linux/ptrace.h> (as userspace process, i.e. host includes), go complaining
with glibc, or follow the linux-abi includes idea.
However, the compilation failure is possibly glibc-version (or better glibc
includes version) related - what I now is that the failure happens on my
system with a glibc 2.3.4 (from Gentoo).
Also, remove some syscalls from the syscall table, since some syscalls were
added which are only inside -mm currently, and this prevents currently
compilation.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---
linux-2.6.11-paolo/arch/um/kernel/process.c | 4 ++++
linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff -puN arch/um/kernel/process.c~uml-fix-compilation-for-missing-headers arch/um/kernel/process.c
--- linux-2.6.11/arch/um/kernel/process.c~uml-fix-compilation-for-missing-headers 2005-01-13 19:57:51.000000000 +0100
+++ linux-2.6.11-paolo/arch/um/kernel/process.c 2005-01-13 19:59:30.000000000 +0100
@@ -13,6 +13,10 @@
#include <setjmp.h>
#include <sys/time.h>
#include <sys/ptrace.h>
+
+/*Userspace header, must be after sys/ptrace.h, and both must be included. */
+#include <linux/ptrace.h>
+
#include <sys/wait.h>
#include <sys/mman.h>
#include <asm/unistd.h>
diff -puN arch/um/kernel/sys_call_table.c~uml-fix-compilation-for-missing-headers arch/um/kernel/sys_call_table.c
--- linux-2.6.11/arch/um/kernel/sys_call_table.c~uml-fix-compilation-for-missing-headers 2005-01-13 20:48:02.000000000 +0100
+++ linux-2.6.11-paolo/arch/um/kernel/sys_call_table.c 2005-01-13 21:17:23.866866296 +0100
@@ -20,7 +20,11 @@
#define NFSSERVCTL sys_ni_syscall
#endif
+#if 0
#define LAST_GENERIC_SYSCALL __NR_vperfctr_read
+#else
+#define LAST_GENERIC_SYSCALL __NR_keyctl
+#endif
#if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
#define LAST_SYSCALL LAST_GENERIC_SYSCALL
@@ -54,11 +58,14 @@ extern syscall_handler_t sys_get_mempoli
extern syscall_handler_t sys_set_mempolicy;
extern syscall_handler_t sys_sys_kexec_load;
extern syscall_handler_t sys_sys_setaltroot;
+
+#if 0
extern syscall_handler_t sys_vperfctr_open;
extern syscall_handler_t sys_vperfctr_control;
extern syscall_handler_t sys_vperfctr_unlink;
extern syscall_handler_t sys_vperfctr_iresume;
extern syscall_handler_t sys_vperfctr_read;
+#endif
syscall_handler_t *sys_call_table[] = {
[ __NR_restart_syscall ] = (syscall_handler_t *) sys_restart_syscall,
@@ -273,7 +280,10 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_mq_timedreceive ] = (syscall_handler_t *) sys_mq_timedreceive,
[ __NR_mq_notify ] = (syscall_handler_t *) sys_mq_notify,
[ __NR_mq_getsetattr ] = (syscall_handler_t *) sys_mq_getsetattr,
+#if 0
[ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_kexec_load,
+#endif
+ [ __NR_sys_kexec_load ] = (syscall_handler_t *) sys_ni_syscall,
[ __NR_waitid ] = (syscall_handler_t *) sys_waitid,
#if 0
[ __NR_sys_setaltroot ] = (syscall_handler_t *) sys_sys_setaltroot,
@@ -281,11 +291,14 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_add_key ] = (syscall_handler_t *) sys_add_key,
[ __NR_request_key ] = (syscall_handler_t *) sys_request_key,
[ __NR_keyctl ] = (syscall_handler_t *) sys_keyctl,
+ /* These syscalls are still in -mm only*/
+#if 0
[ __NR_vperfctr_open ] = (syscall_handler_t *) sys_vperfctr_open,
[ __NR_vperfctr_control ] = (syscall_handler_t *) sys_vperfctr_control,
[ __NR_vperfctr_unlink ] = (syscall_handler_t *) sys_vperfctr_unlink,
[ __NR_vperfctr_iresume ] = (syscall_handler_t *) sys_vperfctr_iresume,
[ __NR_vperfctr_read ] = (syscall_handler_t *) sys_vperfctr_read,
+#endif
ARCH_SYSCALLS
[ LAST_SYSCALL + 1 ... NR_syscalls ] =
_
next reply other threads:[~2005-01-13 21:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-13 21:00 blaisorblade_spam [this message]
2005-01-13 21:00 ` [patch 02/11] uml: fix compilation for missing headers blaisorblade_spam
2005-01-14 0:20 ` [uml-devel] " Blaisorblade
2005-01-14 0:20 ` Blaisorblade
2005-01-14 19:22 ` [uml-devel] " Jeff Dike
2005-01-14 19:22 ` Jeff Dike
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=20050113210051.99326AB30@zion \
--to=blaisorblade_spam@yahoo.it \
--cc=akpm@osdl.org \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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.