diff options
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r-- | kernel/posix-timers.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 21b7ca205f38..89bff3766d7d 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -81,6 +81,14 @@ static DEFINE_SPINLOCK(idr_lock); | |||
81 | #error "SIGEV_THREAD_ID must not share bit with other SIGEV values!" | 81 | #error "SIGEV_THREAD_ID must not share bit with other SIGEV values!" |
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | /* | ||
85 | * parisc wants ENOTSUP instead of EOPNOTSUPP | ||
86 | */ | ||
87 | #ifndef ENOTSUP | ||
88 | # define ENANOSLEEP_NOTSUP EOPNOTSUPP | ||
89 | #else | ||
90 | # define ENANOSLEEP_NOTSUP ENOTSUP | ||
91 | #endif | ||
84 | 92 | ||
85 | /* | 93 | /* |
86 | * The timer ID is turned into a timer address by idr_find(). | 94 | * The timer ID is turned into a timer address by idr_find(). |
@@ -937,11 +945,7 @@ EXPORT_SYMBOL_GPL(do_posix_clock_nosettime); | |||
937 | int do_posix_clock_nonanosleep(const clockid_t clock, int flags, | 945 | int do_posix_clock_nonanosleep(const clockid_t clock, int flags, |
938 | struct timespec *t, struct timespec __user *r) | 946 | struct timespec *t, struct timespec __user *r) |
939 | { | 947 | { |
940 | #ifndef ENOTSUP | 948 | return -ENANOSLEEP_NOTSUP; |
941 | return -EOPNOTSUPP; /* aka ENOTSUP in userland for POSIX */ | ||
942 | #else /* parisc does define it separately. */ | ||
943 | return -ENOTSUP; | ||
944 | #endif | ||
945 | } | 949 | } |
946 | EXPORT_SYMBOL_GPL(do_posix_clock_nonanosleep); | 950 | EXPORT_SYMBOL_GPL(do_posix_clock_nonanosleep); |
947 | 951 | ||