Commit 8070e7be authored by Richard Henderson's avatar Richard Henderson Committed by Riku Voipio
Browse files

alpha-linux-user: Fix umount syscall numbers 



It has been pointed out on LKML that the alpha umount syscall numbers
are named wrong, and a patch to rectify that has been posted for 3.11.

Glibc works around this by treating NR_umount as NR_umount2 if
NR_oldumount exists.  That's more complicated than we need in QEMU,
given that we control linux-user/*/syscall_nr.h.

This is the last instance of TARGET_NR_oldumount, so delete that from
the strace.list.

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent f828a4c8

linux-user/alpha/syscall_nr.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define TARGET_NR_lseek		 19

#define TARGET_NR_getxpid		 20

#define TARGET_NR_osf_mount		 21

#define TARGET_NR_umount		 22

#define TARGET_NR_umount2		 22

#define TARGET_NR_setuid		 23

#define TARGET_NR_getxuid		 24

#define TARGET_NR_exec_with_loader	 25	/* not implemented */
@@ -255,7 +255,7 @@ 
#define TARGET_NR_sysinfo		318

#define TARGET_NR__sysctl		319

/* 320 was sys_idle.  */

#define TARGET_NR_oldumount		321

#define TARGET_NR_umount		321

#define TARGET_NR_swapon		322

#define TARGET_NR_times		323

#define TARGET_NR_personality	324

linux-user/strace.list

+0 −3
Original line number Diff line number Diff line
@@ -612,9 +612,6 @@ 
#ifdef TARGET_NR_oldstat

{ TARGET_NR_oldstat, "oldstat" , NULL, NULL, NULL },

#endif

#ifdef TARGET_NR_oldumount

{ TARGET_NR_oldumount, "oldumount" , NULL, NULL, NULL },

#endif

#ifdef TARGET_NR_olduname

{ TARGET_NR_olduname, "olduname" , NULL, NULL, NULL },

#endif

linux-user/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -5697,7 +5697,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
            unlock_user(p, arg1, 0);

        }

        break;

#ifdef TARGET_NR_umount2 /* not on alpha */

#ifdef TARGET_NR_umount2

    case TARGET_NR_umount2:

        if (!(p = lock_user_string(arg1)))

            goto efault;