From 4ef6befaf5e768863d2f70c7b15a283d819c7c99 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 14 May 2014 10:57:40 -0700 Subject: Update s390 timer_*.c files for x86_64 file moves. --- ChangeLog | 5 +++++ nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c | 2 +- nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c | 2 +- nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c | 2 +- nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c | 2 +- nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02c09a28d3..aa264abe00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,11 @@ Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/clone.S: Deconditionalize the code that was previously under [RESET_PID]. diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c index 172223af3f..d307135003 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c @@ -1 +1 @@ -#include "../x86_64/timer_create.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c index 537516e0aa..2dd94f5c7a 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c @@ -1 +1 @@ -#include "../x86_64/timer_delete.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c index 3f21a73c98..22eaff5cda 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c @@ -1 +1 @@ -#include "../x86_64/timer_getoverr.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c index a50143adc5..cea524bae5 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c @@ -1 +1 @@ -#include "../x86_64/timer_gettime.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c index 37baeffacc..fa231149d5 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c @@ -1 +1 @@ -#include "../x86_64/timer_settime.c" +#include -- cgit v1.2.3-70-g09d2