diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
| commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
| tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /arch/um/sys-i386/unmap.c | |
| parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
| parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/um/sys-i386/unmap.c')
| -rw-r--r-- | arch/um/sys-i386/unmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/unmap.c b/arch/um/sys-i386/unmap.c index 136875263d27..1b0ad0e4adcd 100644 --- a/arch/um/sys-i386/unmap.c +++ b/arch/um/sys-i386/unmap.c | |||
| @@ -15,7 +15,7 @@ int switcheroo(int fd, int prot, void *from, void *to, int size) | |||
| 15 | if(munmap(to, size) < 0){ | 15 | if(munmap(to, size) < 0){ |
| 16 | return(-1); | 16 | return(-1); |
| 17 | } | 17 | } |
| 18 | if(mmap2(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) != to){ | 18 | if(mmap2(to, size, prot, MAP_SHARED | MAP_FIXED, fd, 0) == (void*) -1 ){ |
| 19 | return(-1); | 19 | return(-1); |
| 20 | } | 20 | } |
| 21 | if(munmap(from, size) < 0){ | 21 | if(munmap(from, size) < 0){ |