Prepare for the rename of umount syscall to umount2 introduced by linux
kernel commits v5.1-rc1~160^2~3^2~12 and v5.1-rc1~160^2~3^2~16 on alpha
and ia64 architectures, respectively.
* tests/umount.c: Check for __NR_umount == __NR_umount2.
* tests/umount2.c: Likewise.
#ifdef __NR_oldumount
# define TEST_SYSCALL_STR "oldumount"
#else
-# if defined __NR_umount && defined __NR_umount2
+# if defined __NR_umount && defined __NR_umount2 && __NR_umount != __NR_umount2
# define __NR_oldumount __NR_umount
# define TEST_SYSCALL_STR "umount"
# endif
#include <sys/mount.h>
#include <asm/unistd.h>
-#ifdef __NR_umount2
+#if defined __NR_umount2 && (!defined __NR_umount || __NR_umount2 != __NR_umount)
# define TEST_SYSCALL_STR "umount2"
#else
# define __NR_umount2 __NR_umount