tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] Fix "Remove the use of _syscallX macros in UML"

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@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paolo 'Blaisorblade' Giarrusso and committed by
Linus Torvalds b428b51e bbb5bbb0

+18 -8
+3
arch/um/os-Linux/sys-i386/tls.c
··· 1 1 #include <errno.h> 2 2 #include <linux/unistd.h> 3 + 3 4 #include <sys/syscall.h> 5 + #include <unistd.h> 6 + 4 7 #include "sysdep/tls.h" 5 8 #include "user_util.h" 6 9
+1
arch/um/os-Linux/tls.c
··· 1 1 #include <errno.h> 2 2 #include <sys/ptrace.h> 3 3 #include <sys/syscall.h> 4 + #include <unistd.h> 4 5 #include <asm/ldt.h> 5 6 #include "sysdep/tls.h" 6 7 #include "uml-config.h"
+7 -4
arch/um/sys-i386/unmap.c
··· 5 5 6 6 #include <linux/mman.h> 7 7 #include <asm/unistd.h> 8 - #include <sys/syscall.h> 9 8 9 + static int errno; 10 + 11 + static inline _syscall2(int,munmap,void *,start,size_t,len) 12 + static inline _syscall6(void *,mmap2,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset) 10 13 int switcheroo(int fd, int prot, void *from, void *to, int size) 11 14 { 12 - if (syscall(__NR_munmap, to, size) < 0){ 15 + if(munmap(to, size) < 0){ 13 16 return(-1); 14 17 } 15 - if (syscall(__NR_mmap2, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){ 18 + if(mmap2(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){ 16 19 return(-1); 17 20 } 18 - if (syscall(__NR_munmap, from, size) < 0){ 21 + if(munmap(from, size) < 0){ 19 22 return(-1); 20 23 } 21 24 return(0);
+7 -4
arch/um/sys-x86_64/unmap.c
··· 5 5 6 6 #include <linux/mman.h> 7 7 #include <asm/unistd.h> 8 - #include <sys/syscall.h> 9 8 9 + static int errno; 10 + 11 + static inline _syscall2(int,munmap,void *,start,size_t,len) 12 + static inline _syscall6(void *,mmap,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,offset) 10 13 int switcheroo(int fd, int prot, void *from, void *to, int size) 11 14 { 12 - if (syscall(__NR_munmap, to, size) < 0){ 15 + if(munmap(to, size) < 0){ 13 16 return(-1); 14 17 } 15 - if (syscall(__NR_mmap, to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1){ 18 + if(mmap(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1){ 16 19 return(-1); 17 20 } 18 - if (syscall(__NR_munmap, from, size) < 0){ 21 + if(munmap(from, size) < 0){ 19 22 return(-1); 20 23 } 21 24 return(0);