This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Remove __ASSUME_PROC_PID_TASK_COMM
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Mon, 8 May 2017 15:33:57 +0000
- Subject: Remove __ASSUME_PROC_PID_TASK_COMM
- Authentication-results: sourceware.org; auth=none
This patch removes the __ASSUME_PROC_PID_TASK_COMM macro, and
associated conditional code (in a testcase), now that 3.2 is the
global minimum Linux kernel version supported.
Tested for x86_64.
2017-05-08 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_PROC_PID_TASK_COMM): Remove macro.
* sysdeps/unix/sysv/linux/tst-setgetname.c: Do not include
<kernel-features.h>.
(do_test) [!__ASSUME_PROC_PID_TASK_COMM]: Remove conditional code.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index b981466..d837c22 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -98,12 +98,6 @@
# define __ASSUME_RECVMMSG 1
#endif
-/* Support for /proc/self/task/$tid/comm and /proc/$pid/task/$tid/comm was
- added in 2.6.33. */
-#if __LINUX_KERNEL_VERSION >= 0x020621
-# define __ASSUME_PROC_PID_TASK_COMM 1
-#endif
-
/* statfs fills in f_flags since 2.6.36. */
#if __LINUX_KERNEL_VERSION >= 0x020624
# define __ASSUME_STATFS_F_FLAGS 1
diff --git a/sysdeps/unix/sysv/linux/tst-setgetname.c b/sysdeps/unix/sysv/linux/tst-setgetname.c
index 5acd614..0ab35e6 100644
--- a/sysdeps/unix/sysv/linux/tst-setgetname.c
+++ b/sysdeps/unix/sysv/linux/tst-setgetname.c
@@ -23,7 +23,6 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <kernel-features.h>
/* New name of process. */
#define NEW_NAME "setname"
@@ -101,18 +100,6 @@ do_test (int argc, char **argv)
{
res = get_self_comm (gettid (), name_check, TASK_COMM_LEN);
-#ifndef __ASSUME_PROC_PID_TASK_COMM
- /* On this first test we look for ENOENT to be returned from
- get_self_comm to indicate that the kernel is older than
- 2.6.33 and doesn't contain comm within the proc structure.
- In that case we skip the entire test. */
- if (res == ENOENT)
- {
- printf ("SKIP: The kernel does not have /proc/self/task/%%lu/comm.\n");
- return 0;
- }
-#endif
-
if (res == 0)
{
if (strncmp (name, name_check, strlen (BIG_NAME)) == 0)
--
Joseph S. Myers
joseph@codesourcery.com