[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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/kernel/vdso64/clock_getres.S b/arch/s390/kernel/vdso64/clock_getres.S
index 9ce8caafdb4e..176e1f75f9aa 100644
--- a/arch/s390/kernel/vdso64/clock_getres.S
+++ b/arch/s390/kernel/vdso64/clock_getres.S
@@ -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
diff --git a/arch/s390/kernel/vdso64/clock_gettime.S b/arch/s390/kernel/vdso64/clock_gettime.S
index f40467884a03..d46c95ed5f19 100644
--- a/arch/s390/kernel/vdso64/clock_gettime.S
+++ b/arch/s390/kernel/vdso64/clock_gettime.S
@@ -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 */