diff options
Diffstat (limited to 'arch/mips/kernel/syscall.c')
| -rw-r--r-- | arch/mips/kernel/syscall.c | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 3fe1fcfa2e73..3f7f466190b4 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
| @@ -93,7 +93,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
| 93 | * We do not accept a shared mapping if it would violate | 93 | * We do not accept a shared mapping if it would violate |
| 94 | * cache aliasing constraints. | 94 | * cache aliasing constraints. |
| 95 | */ | 95 | */ |
| 96 | if ((flags & MAP_SHARED) && (addr & shm_align_mask)) | 96 | if ((flags & MAP_SHARED) && |
| 97 | ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask)) | ||
| 97 | return -EINVAL; | 98 | return -EINVAL; |
| 98 | return addr; | 99 | return addr; |
| 99 | } | 100 | } |
| @@ -129,31 +130,6 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, | |||
| 129 | } | 130 | } |
| 130 | } | 131 | } |
| 131 | 132 | ||
| 132 | /* common code for old and new mmaps */ | ||
| 133 | static inline unsigned long | ||
| 134 | do_mmap2(unsigned long addr, unsigned long len, unsigned long prot, | ||
| 135 | unsigned long flags, unsigned long fd, unsigned long pgoff) | ||
| 136 | { | ||
| 137 | unsigned long error = -EBADF; | ||
| 138 | struct file * file = NULL; | ||
| 139 | |||
| 140 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); | ||
| 141 | if (!(flags & MAP_ANONYMOUS)) { | ||
| 142 | file = fget(fd); | ||
| 143 | if (!file) | ||
| 144 | goto out; | ||
| 145 | } | ||
| 146 | |||
| 147 | down_write(¤t->mm->mmap_sem); | ||
| 148 | error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); | ||
| 149 | up_write(¤t->mm->mmap_sem); | ||
| 150 | |||
| 151 | if (file) | ||
| 152 | fput(file); | ||
| 153 | out: | ||
| 154 | return error; | ||
| 155 | } | ||
| 156 | |||
| 157 | SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, | 133 | SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, |
| 158 | unsigned long, prot, unsigned long, flags, unsigned long, | 134 | unsigned long, prot, unsigned long, flags, unsigned long, |
| 159 | fd, off_t, offset) | 135 | fd, off_t, offset) |
| @@ -164,7 +140,7 @@ SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len, | |||
| 164 | if (offset & ~PAGE_MASK) | 140 | if (offset & ~PAGE_MASK) |
| 165 | goto out; | 141 | goto out; |
| 166 | 142 | ||
| 167 | result = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT); | 143 | result = sys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT); |
| 168 | 144 | ||
| 169 | out: | 145 | out: |
| 170 | return result; | 146 | return result; |
| @@ -177,7 +153,7 @@ SYSCALL_DEFINE6(mips_mmap2, unsigned long, addr, unsigned long, len, | |||
| 177 | if (pgoff & (~PAGE_MASK >> 12)) | 153 | if (pgoff & (~PAGE_MASK >> 12)) |
| 178 | return -EINVAL; | 154 | return -EINVAL; |
| 179 | 155 | ||
| 180 | return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12)); | 156 | return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12)); |
| 181 | } | 157 | } |
| 182 | 158 | ||
| 183 | save_static_function(sys_fork); | 159 | save_static_function(sys_fork); |
| @@ -306,6 +282,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, | |||
| 306 | 282 | ||
| 307 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 283 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
| 308 | __asm__ __volatile__ ( | 284 | __asm__ __volatile__ ( |
| 285 | " .set mips3 \n" | ||
| 309 | " li %[err], 0 \n" | 286 | " li %[err], 0 \n" |
| 310 | "1: ll %[old], (%[addr]) \n" | 287 | "1: ll %[old], (%[addr]) \n" |
| 311 | " move %[tmp], %[new] \n" | 288 | " move %[tmp], %[new] \n" |
| @@ -320,6 +297,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, | |||
| 320 | " "STR(PTR)" 1b, 4b \n" | 297 | " "STR(PTR)" 1b, 4b \n" |
| 321 | " "STR(PTR)" 2b, 4b \n" | 298 | " "STR(PTR)" 2b, 4b \n" |
| 322 | " .previous \n" | 299 | " .previous \n" |
| 300 | " .set mips0 \n" | ||
| 323 | : [old] "=&r" (old), | 301 | : [old] "=&r" (old), |
| 324 | [err] "=&r" (err), | 302 | [err] "=&r" (err), |
| 325 | [tmp] "=&r" (tmp) | 303 | [tmp] "=&r" (tmp) |
| @@ -329,6 +307,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, | |||
| 329 | : "memory"); | 307 | : "memory"); |
| 330 | } else if (cpu_has_llsc) { | 308 | } else if (cpu_has_llsc) { |
| 331 | __asm__ __volatile__ ( | 309 | __asm__ __volatile__ ( |
| 310 | " .set mips3 \n" | ||
| 332 | " li %[err], 0 \n" | 311 | " li %[err], 0 \n" |
| 333 | "1: ll %[old], (%[addr]) \n" | 312 | "1: ll %[old], (%[addr]) \n" |
| 334 | " move %[tmp], %[new] \n" | 313 | " move %[tmp], %[new] \n" |
| @@ -347,6 +326,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, | |||
| 347 | " "STR(PTR)" 1b, 5b \n" | 326 | " "STR(PTR)" 1b, 5b \n" |
| 348 | " "STR(PTR)" 2b, 5b \n" | 327 | " "STR(PTR)" 2b, 5b \n" |
| 349 | " .previous \n" | 328 | " .previous \n" |
| 329 | " .set mips0 \n" | ||
| 350 | : [old] "=&r" (old), | 330 | : [old] "=&r" (old), |
| 351 | [err] "=&r" (err), | 331 | [err] "=&r" (err), |
| 352 | [tmp] "=&r" (tmp) | 332 | [tmp] "=&r" (tmp) |