From 501bdb5dd61afc714a098cd5ff441bd114584f75 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 15 May 2020 11:32:30 +0200 Subject: Linux: Remove remnants of the getcpu cache The getcpu cache was removed from the kernel in Linux 2.6.24. glibc support from the sched_getcpu implementation was removed in commit dd26c44403582fdf10d663170f947dfe4b3207a0 ("Consolidate sched_getcpu"). --- sysdeps/unix/sysv/linux/pthread_setaffinity.c | 5 ----- sysdeps/unix/sysv/linux/sched_setaffinity.c | 5 ----- sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c | 14 -------------- sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c | 14 -------------- 4 files changed, 38 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/sysdeps/unix/sysv/linux/pthread_setaffinity.c index 264d677..b0bd90c 100644 --- a/sysdeps/unix/sysv/linux/pthread_setaffinity.c +++ b/sysdeps/unix/sysv/linux/pthread_setaffinity.c @@ -33,11 +33,6 @@ __pthread_setaffinity_new (pthread_t th, size_t cpusetsize, res = INTERNAL_SYSCALL_CALL (sched_setaffinity, pd->tid, cpusetsize, cpuset); -#ifdef RESET_VGETCPU_CACHE - if (!INTERNAL_SYSCALL_ERROR_P (res)) - RESET_VGETCPU_CACHE (); -#endif - return (INTERNAL_SYSCALL_ERROR_P (res) ? INTERNAL_SYSCALL_ERRNO (res) : 0); diff --git a/sysdeps/unix/sysv/linux/sched_setaffinity.c b/sysdeps/unix/sysv/linux/sched_setaffinity.c index fc2c692..978291f 100644 --- a/sysdeps/unix/sysv/linux/sched_setaffinity.c +++ b/sysdeps/unix/sysv/linux/sched_setaffinity.c @@ -32,11 +32,6 @@ __sched_setaffinity_new (pid_t pid, size_t cpusetsize, const cpu_set_t *cpuset) { int result = INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset); -#ifdef RESET_VGETCPU_CACHE - if (result != -1) - RESET_VGETCPU_CACHE (); -#endif - return result; } libc_hidden_def (__sched_setaffinity_new) diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c b/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c deleted file mode 100644 index a7bbe38..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c +++ /dev/null @@ -1,14 +0,0 @@ -#include - -#define RESET_VGETCPU_CACHE() \ - do { \ - asm volatile ("movl %0, %%fs:%P1\n\t" \ - "movl %0, %%fs:%P2" \ - : \ - : "ir" (0), "i" (offsetof (struct pthread, \ - header.vgetcpu_cache[0])), \ - "i" (offsetof (struct pthread, \ - header.vgetcpu_cache[1]))); \ - } while (0) - -#include diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c b/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c deleted file mode 100644 index d1101c5..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c +++ /dev/null @@ -1,14 +0,0 @@ -#include - -#define RESET_VGETCPU_CACHE() \ - do { \ - asm volatile ("movl %0, %%fs:%P1\n\t" \ - "movl %0, %%fs:%P2" \ - : \ - : "ir" (0), "i" (offsetof (struct pthread, \ - header.vgetcpu_cache[0])), \ - "i" (offsetof (struct pthread, \ - header.vgetcpu_cache[1]))); \ - } while (0) - -#include "../sched_setaffinity.c" -- cgit v1.1