The patch titled
Fix "Remove the use of _syscallX macros in UML"
has been added to the -mm tree. Its filename is
fix-remove-the-use-of-_syscallx-macros-in-uml.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix "Remove the use of _syscallX macros in UML"
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Fix commit 5f4c6bc1f369f20807a8e753c2308d1629478c61: it spits out warnings
about missing syscall prototype (it is in <unistd.h>) and it does not
recognize that two uses of _syscallX are to be resolved against kernel
headers in the source tree, not against _syscallX; they in fact do not
compile and would not work anyway.
If _syscallX macros will be removed from the kernel tree altogether, the
only reasonable solution for that piece of code is switching to open-coded
inline assembly (it's remapping the whole executable from memory, except
the page containing this code).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/os-Linux/sys-i386/tls.c | 3 +++
arch/um/os-Linux/tls.c | 1 +
arch/um/sys-i386/unmap.c | 11 +++++++----
arch/um/sys-x86_64/unmap.c | 11 +++++++----
4 files changed, 18 insertions(+), 8 deletions(-)
diff -puN arch/um/os-Linux/sys-i386/tls.c~fix-remove-the-use-of-_syscallx-macros-in-uml arch/um/os-Linux/sys-i386/tls.c
--- a/arch/um/os-Linux/sys-i386/tls.c~fix-remove-the-use-of-_syscallx-macros-in-uml
+++ a/arch/um/os-Linux/sys-i386/tls.c
@@ -1,6 +1,9 @@
#include <errno.h>
#include <linux/unistd.h>
+
#include <sys/syscall.h>
+#include <unistd.h>
+
#include "sysdep/tls.h"
#include "user_util.h"
diff -puN arch/um/os-Linux/tls.c~fix-remove-the-use-of-_syscallx-macros-in-uml arch/um/os-Linux/tls.c
--- a/arch/um/os-Linux/tls.c~fix-remove-the-use-of-_syscallx-macros-in-uml
+++ a/arch/um/os-Linux/tls.c
@@ -1,6 +1,7 @@
#include <errno.h>
#include <sys/ptrace.h>
#include <sys/syscall.h>
+#include <unistd.h>
#include <asm/ldt.h>
#include "sysdep/tls.h"
#include "uml-config.h"
diff -puN arch/um/sys-i386/unmap.c~fix-remove-the-use-of-_syscallx-macros-in-uml arch/um/sys-i386/unmap.c
--- a/arch/um/sys-i386/unmap.c~fix-remove-the-use-of-_syscallx-macros-in-uml
+++ a/arch/um/sys-i386/unmap.c
@@ -5,17 +5,20 @@
#include <linux/mman.h>
#include <asm/unistd.h>
-#include <sys/syscall.h>
+static int errno;
+
+static inline _syscall2(int,munmap,void *,start,size_t,len)
+static inline _syscall6(void *,mmap2,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset)
int switcheroo(int fd, int prot, void *from, void *to, int size)
{
- if (syscall(__NR_munmap, to, size) < 0){
+ if(munmap(to, size) < 0){
return(-1);
}
- if (syscall(__NR_mmap2, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){
+ if(mmap2(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){
return(-1);
}
- if (syscall(__NR_munmap, from, size) < 0){
+ if(munmap(from, size) < 0){
return(-1);
}
return(0);
diff -puN arch/um/sys-x86_64/unmap.c~fix-remove-the-use-of-_syscallx-macros-in-uml arch/um/sys-x86_64/unmap.c
--- a/arch/um/sys-x86_64/unmap.c~fix-remove-the-use-of-_syscallx-macros-in-uml
+++ a/arch/um/sys-x86_64/unmap.c
@@ -5,17 +5,20 @@
#include <linux/mman.h>
#include <asm/unistd.h>
-#include <sys/syscall.h>
+static int errno;
+
+static inline _syscall2(int,munmap,void *,start,size_t,len)
+static inline _syscall6(void *,mmap,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset)
int switcheroo(int fd, int prot, void *from, void *to, int size)
{
- if (syscall(__NR_munmap, to, size) < 0){
+ if(munmap(to, size) < 0){
return(-1);
}
- if (syscall(__NR_mmap, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1){
+ if(mmap(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1){
return(-1);
}
- if (syscall(__NR_munmap, from, size) < 0){
+ if(munmap(from, size) < 0){
return(-1);
}
return(0);
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
fix-remove-the-use-of-_syscallx-macros-in-uml.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
