Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3423982 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] vdso: get rid of redefinition warnings 



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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e0317247

arch/s390/kernel/asm-offsets.c

+3 −3
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ int main(void) 
	DEFINE(__VDSO_ECTG_BASE, offsetof(struct vdso_per_cpu_data, ectg_timer_base));

	DEFINE(__VDSO_ECTG_USER, offsetof(struct vdso_per_cpu_data, ectg_user_time));

	/* constants used by the vdso */

	DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);

	DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);

	DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);

	DEFINE(__CLOCK_REALTIME, CLOCK_REALTIME);

	DEFINE(__CLOCK_MONOTONIC, CLOCK_MONOTONIC);

	DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);

	BLANK();

	/* constants for SIGP */

	DEFINE(__SIGP_STOP, sigp_stop);

arch/s390/kernel/vdso32/clock_getres.S

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
	.type  __kernel_clock_getres,@function

__kernel_clock_getres:

	.cfi_startproc

	chi	%r2,CLOCK_REALTIME

	chi	%r2,__CLOCK_REALTIME

	je	0f

	chi	%r2,CLOCK_MONOTONIC

	chi	%r2,__CLOCK_MONOTONIC

	jne	3f

0:	ltr	%r3,%r3

	jz	2f				/* res == NULL */
@@ -34,6 +34,6 @@ __kernel_clock_getres: 
3:	lhi	%r1,__NR_clock_getres		/* fallback to svc */

	svc	0

	br	%r14

4:	.long	CLOCK_REALTIME_RES

4:	.long	__CLOCK_REALTIME_RES

	.cfi_endproc

	.size	__kernel_clock_getres,.-__kernel_clock_getres

arch/s390/kernel/vdso32/clock_gettime.S

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ __kernel_clock_gettime: 
	.cfi_startproc

	basr	%r5,0

0:	al	%r5,21f-0b(%r5)			/* get &_vdso_data */

	chi	%r2,CLOCK_REALTIME

	chi	%r2,__CLOCK_REALTIME

	je	10f

	chi	%r2,CLOCK_MONOTONIC

	chi	%r2,__CLOCK_MONOTONIC

	jne	19f



	/* CLOCK_MONOTONIC */

arch/s390/kernel/vdso64/clock_getres.S

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
	.type  __kernel_clock_getres,@function

__kernel_clock_getres:

	.cfi_startproc

	cghi	%r2,CLOCK_REALTIME

	cghi	%r2,__CLOCK_REALTIME

	je	0f

	cghi	%r2,CLOCK_MONOTONIC

	cghi	%r2,__CLOCK_MONOTONIC

	je	0f

	cghi	%r2,-2		/* CLOCK_THREAD_CPUTIME_ID for this thread */

	jne	2f
@@ -39,6 +39,6 @@ __kernel_clock_getres: 
2:	lghi	%r1,__NR_clock_getres		/* fallback to svc */

	svc	0

	br	%r14

3:	.quad	CLOCK_REALTIME_RES

3:	.quad	__CLOCK_REALTIME_RES

	.cfi_endproc

	.size	__kernel_clock_getres,.-__kernel_clock_getres

arch/s390/kernel/vdso64/clock_gettime.S

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
__kernel_clock_gettime:

	.cfi_startproc

	larl	%r5,_vdso_data

	cghi	%r2,CLOCK_REALTIME

	cghi	%r2,__CLOCK_REALTIME

	je	4f

	cghi	%r2,-2		/* CLOCK_THREAD_CPUTIME_ID for this thread */

	je	9f

	cghi	%r2,CLOCK_MONOTONIC

	cghi	%r2,__CLOCK_MONOTONIC

	jne	12f



	/* CLOCK_MONOTONIC */