Signed-off-by: Suzuki K P Fix timer_t argument for timer related direct syscalls. The tests timer_getoverrun and timer_gettime should be moved to testcases/kernel/timers directory. If that is done, then we could use the definition in the common_timers.h, like the other tests. /* Description */ There is a mismatch in the "timer_t" type defined by the Linux kernel and the GNU Libc. Linux kernel defines it as an int for all architectures. include/linux/types.h : typedef __kernel_timer_t timer_t; arch/powerpc/include/asm/posix_types.h : typedef int __kernel_timer_t; Now, the glibc provides a wrapper to the timer related system calls. While providing the wrapper, Glibc stores some internal data associated with the timer. So it defines the "timer_t" as a pointer (void*) as below: /usr/include/time.h : /* Timer ID returned by `timer_create'. */ typedef __timer_t timer_t; in /usr/include/bits/types.h : /* Timer ID returned by `timer_create'. */ __STD_TYPE __TIMER_T_TYPE __timer_t; in /usr/include/bits/typesizes.h #define __TIMER_T_TYPE void * So that leads to the definiton of timer_t as void* by glibc. And this cannot be changed. But the glibc uses the "proper" typed argument for the syscalls it issues by defining a kernel_timer_t. On 32bit machines the difference is not noticed, since both the timer_t in userspace and the kernel space are of the same size. But on 64bit machines this is different. Userspace has a width of 64bit and the kernel has 32bit width. Now, when we pass the pointer to timer_t to the kernel, things get complicated and on Big endian machines, ppc64, s390x, this leads to a problem. As the value kept is not available when we try to dereference it as a 32bit and this leads to undesired results Index: ltp/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c =================================================================== --- ltp.orig/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c 2009-05-21 18:41:36.000000000 +0000 +++ ltp/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c 2010-05-27 13:46:55.000000000 +0000 @@ -49,6 +49,11 @@ #include "usctest.h" #include "linux_syscall_numbers.h" +/* timer_t in kernel(int) is different from Glibc definition(void*). + * Use the kernel definition. + */ +typedef int kernel_timer_t; + /* Extern Global Variables */ extern int Tst_count; /* counter for tst_xxx routines. */ extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ @@ -120,7 +125,7 @@ int main(int ac, char **av) { int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t created_timer_id; + kernel_timer_t created_timer_id; struct sigevent ev; /* parse standard options */ Index: ltp/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c =================================================================== --- ltp.orig/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c 2009-05-21 18:43:48.000000000 +0000 +++ ltp/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c 2010-05-27 13:47:25.000000000 +0000 @@ -48,6 +48,11 @@ #include "usctest.h" #include "linux_syscall_numbers.h" +/* timer_t in kernel(int) is different from Glibc definition(void*). + * Use the kernel definition. + */ +typedef int kernel_timer_t; + /* Extern Global Variables */ extern int Tst_count; /* counter for tst_xxx routines. */ extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ @@ -122,7 +127,7 @@ int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t created_timer_id; + kernel_timer_t created_timer_id; struct sigevent ev; struct itimerspec spec; Index: ltp/testcases/kernel/timers/timer_delete/timer_delete02.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_delete/timer_delete02.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_delete/timer_delete02.c 2010-05-27 14:01:21.000000000 +0000 @@ -84,7 +84,7 @@ { int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t timer_id; + kernel_timer_t timer_id; /* parse standard options */ if ((msg = parse_opts (ac, av, (option_t *) NULL, NULL)) != Index: ltp/testcases/kernel/timers/timer_delete/timer_delete03.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_delete/timer_delete03.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_delete/timer_delete03.c 2010-05-27 14:01:35.000000000 +0000 @@ -73,7 +73,7 @@ #include "usctest.h" #include "common_timers.h" -#define INVALID_ID ((timer_t)-1) +#define INVALID_ID ((kernel_timer_t)-1) static void setup(); Index: ltp/testcases/kernel/timers/timer_create/timer_create02.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_create/timer_create02.c 2010-05-19 06:19:20.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_create/timer_create02.c 2010-05-27 14:00:08.000000000 +0000 @@ -86,7 +86,7 @@ { int lc, i, j; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t created_timer_id; /* holds the returned timer_id */ + kernel_timer_t created_timer_id; /* holds the returned timer_id */ char *message[3] = { "SIGEV_SIGNAL", "NULL", Index: ltp/testcases/kernel/timers/timer_create/timer_create03.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_create/timer_create03.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_create/timer_create03.c 2010-05-27 14:00:47.000000000 +0000 @@ -100,7 +100,7 @@ { int lc, i; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t created_timer_id; /* holds the returned timer_id */ + kernel_timer_t created_timer_id; /* holds the returned timer_id */ char *message[] = { "SIGEV_SIGNAL", "NULL", Index: ltp/testcases/kernel/timers/timer_create/timer_create04.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_create/timer_create04.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_create/timer_create04.c 2010-05-27 14:01:05.000000000 +0000 @@ -111,7 +111,7 @@ { int lc, i; /* loop counter */ char *msg; /* message returned from parse_opts */ - timer_t timer_id, *temp_id; /* stores the returned timer_id */ + kernel_timer_t timer_id, *temp_id; /* stores the returned timer_id */ struct sigevent *temp_ev; /* used for bad address test case */ clockid_t clocks[6] = { @@ -158,7 +158,7 @@ switch (i) { case 2: /* make the timer_id bad address */ - temp_id = (timer_t *) -1; + temp_id = (kernel_timer_t *) -1; break; case 3: /* make the event bad address */ @@ -167,7 +167,7 @@ case 4: /* Produce an invalid timer_id address. */ if(tst_kvercmp(2, 6, 12) >= 0) - temp_id = (timer_t *) -1; + temp_id = (kernel_timer_t *) -1; break; case 5: /* Produce an invalid event address. */ Index: ltp/testcases/kernel/timers/timer_settime/timer_settime02.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_settime/timer_settime02.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_settime/timer_settime02.c 2010-05-27 14:01:53.000000000 +0000 @@ -81,7 +81,7 @@ extern int Tst_count; /* Test Case counter for tst_* routines */ static struct itimerspec new_set, old_set, *old_temp; -static timer_t timer; +static kernel_timer_t timer; static int flag; int Index: ltp/testcases/kernel/timers/timer_settime/timer_settime03.c =================================================================== --- ltp.orig/testcases/kernel/timers/timer_settime/timer_settime03.c 2009-12-06 20:53:44.000000000 +0000 +++ ltp/testcases/kernel/timers/timer_settime/timer_settime03.c 2010-05-27 14:02:03.000000000 +0000 @@ -81,7 +81,7 @@ extern int Tst_count; /* Test Case counter for tst_* routines */ static struct itimerspec new_set, old_set, *old_temp, *new_temp; -static timer_t timer, tim; +static kernel_timer_t timer, tim; static int exp_enos[] = {EINVAL, EFAULT, 0}; @@ -168,7 +168,7 @@ break; case 3: /* make timer_id invalid */ - tim = (timer_t)-1; + tim = (kernel_timer_t)-1; new_set.it_value.tv_nsec = 0; break; case 4: Index: ltp/testcases/kernel/timers/include/common_timers.h =================================================================== --- ltp.orig/testcases/kernel/timers/include/common_timers.h 2010-05-19 06:19:20.000000000 +0000 +++ ltp/testcases/kernel/timers/include/common_timers.h 2010-05-27 14:02:50.000000000 +0000 @@ -63,4 +63,9 @@ #include #include +/* timer_t in kernel(int) is different from Glibc definition(void*). + * Use the kernel definition for syscall tests + */ +typedef int kernel_timer_t; + #endif