Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / kernel / time / posix-timers.c

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 3ac7295306dcdf3ccd32547159b1fded304acbc4..f23cc46ecf3ed10bbd0bd940c87f3e813dd5bf4c 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -85,15 +85,6 @@ static const struct k_clock clock_realtime, clock_monotonic;
 #error "SIGEV_THREAD_ID must not share bit with other SIGEV values!"
 #endif
 
-/*
- * parisc wants ENOTSUP instead of EOPNOTSUPP
- */
-#ifndef ENOTSUP
-# define ENANOSLEEP_NOTSUP EOPNOTSUPP
-#else
-# define ENANOSLEEP_NOTSUP ENOTSUP
-#endif
-
 /*
  * The timer ID is turned into a timer address by idr_find().
  * Verifying a valid ID consists of:
@@ -1231,7 +1222,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
        if (!kc)
                return -EINVAL;
        if (!kc->nsleep)
-               return -ENANOSLEEP_NOTSUP;
+               return -EOPNOTSUPP;
 
        if (get_timespec64(&t, rqtp))
                return -EFAULT;
@@ -1258,7 +1249,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
        if (!kc)
                return -EINVAL;
        if (!kc->nsleep)
-               return -ENANOSLEEP_NOTSUP;
+               return -EOPNOTSUPP;
 
        if (compat_get_timespec64(&t, rqtp))
                return -EFAULT;