Commit 12f5aa08 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Adrian Bunk

UML: fix the MODE_TT compilation

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent ac5d18df
...@@ -5,17 +5,20 @@ ...@@ -5,17 +5,20 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <asm/unistd.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) 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); 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); return(-1);
} }
if (syscall(__NR_munmap, from, size) < 0){ if(munmap(from, size) < 0){
return(-1); return(-1);
} }
return(0); return(0);
......
...@@ -5,17 +5,20 @@ ...@@ -5,17 +5,20 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <asm/unistd.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) 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); 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); return(-1);
} }
if (syscall(__NR_munmap, from, size) < 0){ if(munmap(from, size) < 0){
return(-1); return(-1);
} }
return(0); return(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment