[S390] Convert s390 to GENERIC_CLOCKEVENTS.

This way we get rid of s390's NO_IDLE_HZ and use the generic dynticks
variant instead. In addition we get high resolution timers for free.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h
index 31beb18cb3d..4b7cb964ff3 100644
--- a/include/asm-s390/hardirq.h
+++ b/include/asm-s390/hardirq.h
@@ -32,6 +32,6 @@ typedef struct {
 
 #define HARDIRQ_BITS    8
 
-extern void account_ticks(u64 time);
+void clock_comparator_work(void);
 
 #endif /* __ASM_HARDIRQ_H */
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index 801a6fd35b5..6baa51b8683 100644
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -80,7 +80,6 @@
 #define __LC_CPUID                      0xC60
 #define __LC_CPUADDR                    0xC68
 #define __LC_IPLDEV                     0xC7C
-#define __LC_JIFFY_TIMER                0xC80
 #define __LC_CURRENT                    0xC90
 #define __LC_INT_CLOCK                  0xC98
 #else /* __s390x__ */
@@ -103,7 +102,6 @@
 #define __LC_CPUID                      0xD80
 #define __LC_CPUADDR                    0xD88
 #define __LC_IPLDEV                     0xDB8
-#define __LC_JIFFY_TIMER                0xDC0
 #define __LC_CURRENT                    0xDD8
 #define __LC_INT_CLOCK                  0xDE8
 #endif /* __s390x__ */
@@ -276,7 +274,7 @@ struct _lowcore
         /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
-        __u64        jiffy_timer;              /* 0xc80 */
+        __u64        clock_comparator;         /* 0xc80 */
         __u32        ext_call_fast;            /* 0xc88 */
         __u32        percpu_offset;            /* 0xc8c */
         __u32        current_task;             /* 0xc90 */
@@ -368,7 +366,7 @@ struct _lowcore
         /* entry.S sensitive area end */
 
         /* SMP info area: defined by DJB */
-        __u64        jiffy_timer;              /* 0xdc0 */
+        __u64        clock_comparator;         /* 0xdc0 */
         __u64        ext_call_fast;            /* 0xdc8 */
         __u64        percpu_offset;            /* 0xdd0 */
         __u64        current_task;             /* 0xdd8 */