Skip to content

Commit 93cb8e2

Browse files
committed
parisc: Drop architecture-specific ENOTSUP define
parisc is the only Linux architecture which has defined a value for ENOTSUP. All other architectures #define ENOTSUP as EOPNOTSUPP in their libc headers. Having an own value for ENOTSUP which is different than EOPNOTSUPP often gives problems with userspace programs which expect both to be the same. One such example is a build error in the libuv package, as can be seen in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900237. Since we dropped HP-UX support, there is no real benefit in keeping an own value for ENOTSUP. This patch drops the parisc value for ENOTSUP from the kernel sources. glibc needs no patch, it reuses the exported headers. Signed-off-by: Helge Deller <deller@gmx.de>
1 parent c1f5937 commit 93cb8e2

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

arch/parisc/include/uapi/asm/errno.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
#define ELOOP 249 /* Too many symbolic links encountered */
114114
#define ENOSYS 251 /* Function not implemented */
115115

116-
#define ENOTSUP 252 /* Function not implemented (POSIX.4 / HPUX) */
117116
#define ECANCELLED 253 /* aio request was canceled before complete (POSIX.4 / HPUX) */
118117
#define ECANCELED ECANCELLED /* SuSv3 and Solaris wants one 'L' */
119118

kernel/time/posix-timers.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@ static const struct k_clock clock_realtime, clock_monotonic;
8585
#error "SIGEV_THREAD_ID must not share bit with other SIGEV values!"
8686
#endif
8787

88-
/*
89-
* parisc wants ENOTSUP instead of EOPNOTSUPP
90-
*/
91-
#ifndef ENOTSUP
92-
# define ENANOSLEEP_NOTSUP EOPNOTSUPP
93-
#else
94-
# define ENANOSLEEP_NOTSUP ENOTSUP
95-
#endif
96-
9788
/*
9889
* The timer ID is turned into a timer address by idr_find().
9990
* Verifying a valid ID consists of:
@@ -1220,7 +1211,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
12201211
if (!kc)
12211212
return -EINVAL;
12221213
if (!kc->nsleep)
1223-
return -ENANOSLEEP_NOTSUP;
1214+
return -EOPNOTSUPP;
12241215

12251216
if (get_timespec64(&t, rqtp))
12261217
return -EFAULT;
@@ -1247,7 +1238,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
12471238
if (!kc)
12481239
return -EINVAL;
12491240
if (!kc->nsleep)
1250-
return -ENANOSLEEP_NOTSUP;
1241+
return -EOPNOTSUPP;
12511242

12521243
if (compat_get_timespec64(&t, rqtp))
12531244
return -EFAULT;

tools/arch/parisc/include/uapi/asm/errno.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
#define ELOOP 249 /* Too many symbolic links encountered */
114114
#define ENOSYS 251 /* Function not implemented */
115115

116-
#define ENOTSUP 252 /* Function not implemented (POSIX.4 / HPUX) */
117116
#define ECANCELLED 253 /* aio request was canceled before complete (POSIX.4 / HPUX) */
118117
#define ECANCELED ECANCELLED /* SuSv3 and Solaris wants one 'L' */
119118

0 commit comments

Comments
 (0)