b3423982bd
The CLOCK_* defines in asm-offsets.c are only used for the vdso code
however in the meantime they cause other trouble.
Just rename them to get permanently rid of this:
In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/asm-offsets.h:1:0,
from arch/s390/mm/fault.c:33:
include/generated/asm-offsets.h:53:0: warning: "CLOCK_REALTIME" redefined
include/linux/time.h:286:0: note: this is the location of the previous definition
include/generated/asm-offsets.h:54:0: warning: "CLOCK_MONOTONIC" redefined
include/linux/time.h:287:0: note: this is the location of the previous definition
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
40 lines
1.0 KiB
ArmAsm
40 lines
1.0 KiB
ArmAsm
/*
|
|
* Userland implementation of clock_getres() for 32 bits processes in a
|
|
* s390 kernel for use in the vDSO
|
|
*
|
|
* Copyright IBM Corp. 2008
|
|
* Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (version 2 only)
|
|
* as published by the Free Software Foundation.
|
|
*/
|
|
#include <asm/vdso.h>
|
|
#include <asm/asm-offsets.h>
|
|
#include <asm/unistd.h>
|
|
|
|
.text
|
|
.align 4
|
|
.globl __kernel_clock_getres
|
|
.type __kernel_clock_getres,@function
|
|
__kernel_clock_getres:
|
|
.cfi_startproc
|
|
chi %r2,__CLOCK_REALTIME
|
|
je 0f
|
|
chi %r2,__CLOCK_MONOTONIC
|
|
jne 3f
|
|
0: ltr %r3,%r3
|
|
jz 2f /* res == NULL */
|
|
basr %r1,0
|
|
1: l %r0,4f-1b(%r1)
|
|
xc 0(4,%r3),0(%r3) /* set tp->tv_sec to zero */
|
|
st %r0,4(%r3) /* store tp->tv_usec */
|
|
2: lhi %r2,0
|
|
br %r14
|
|
3: lhi %r1,__NR_clock_getres /* fallback to svc */
|
|
svc 0
|
|
br %r14
|
|
4: .long __CLOCK_REALTIME_RES
|
|
.cfi_endproc
|
|
.size __kernel_clock_getres,.-__kernel_clock_getres
|