Merge tag 'linux-watchdog-5.14-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-microblaze.git] / ipc / syscall.c

diff --git a/ipc/syscall.c b/ipc/syscall.c
index 581bdff..dfb0e98 100644 (file)
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -30,7 +30,7 @@ int ksys_ipc(unsigned int call, int first, unsigned long second,
                return ksys_semtimedop(first, (struct sembuf __user *)ptr,
                                       second, NULL);
        case SEMTIMEDOP:
-               if (IS_ENABLED(CONFIG_64BIT) || !IS_ENABLED(CONFIG_64BIT_TIME))
+               if (IS_ENABLED(CONFIG_64BIT))
                        return ksys_semtimedop(first, ptr, second,
                                (const struct __kernel_timespec __user *)fifth);
                else if (IS_ENABLED(CONFIG_COMPAT_32BIT_TIME))