gwj / at91sam9263 · Commits

Commit 14ae3ba7f94f962669e3274cad28dcabb5185287

Authored by bellard
1 parent 5a91de8c

mmap2 fix 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@190 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
linux-user/syscall.c
  View file @14ae3ba
@@ -1047,7 +1047,7 @@ static int write_ldt(CPUX86State *env, @@ -1047,7 +1047,7 @@ static int write_ldt(CPUX86State *env,
1047 0x7000; 1047 0x7000;
1048 if (!oldmode) 1048 if (!oldmode)
1049 entry_2 |= (useable << 20); 1049 entry_2 |= (useable << 20);
1050 - 1050 +
1051 /* Install the new entry ... */ 1051 /* Install the new entry ... */
1052 install: 1052 install:
1053 lp = (uint32_t *)(ldt_table + (ldt_info.entry_number << 3)); 1053 lp = (uint32_t *)(ldt_table + (ldt_info.entry_number << 3));
@@ -1753,7 +1753,8 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3, @@ -1753,7 +1753,8 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
1753 #else 1753 #else
1754 case TARGET_NR_mmap: 1754 case TARGET_NR_mmap:
1755 #endif 1755 #endif
1756 - ret = get_errno(target_mmap(arg1, arg2, arg3, arg4, arg5, arg6)); 1756 + ret = get_errno(target_mmap(arg1, arg2, arg3, arg4, arg5,
  1757 + arg6 << TARGET_PAGE_BITS));
1757 break; 1758 break;
1758 case TARGET_NR_munmap: 1759 case TARGET_NR_munmap:
1759 ret = get_errno(target_munmap(arg1, arg2)); 1760 ret = get_errno(target_munmap(arg1, arg2));