s390: Replace __get_cpu_var uses

[linux-2.6-block.git] / arch / s390 / kernel / time.c

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 4cef607f371122fc2fcc7959bd6f12cff3d3d896..4e5a6d881c62a5ce0038db8aed60ab0cf164479f 100644 (file)
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -92,7 +92,7 @@ void clock_comparator_work(void)
        struct clock_event_device *cd;
 
        S390_lowcore.clock_comparator = -1ULL;
-       cd = &__get_cpu_var(comparators);
+       cd = this_cpu_ptr(&comparators);
        cd->event_handler(cd);
 }
 
@@ -360,7 +360,7 @@ EXPORT_SYMBOL(get_sync_clock);
  */
 static void disable_sync_clock(void *dummy)
 {
-       atomic_t *sw_ptr = &__get_cpu_var(clock_sync_word);
+       atomic_t *sw_ptr = this_cpu_ptr(&clock_sync_word);
        /*
         * Clear the in-sync bit 2^31. All get_sync_clock calls will
         * fail until the sync bit is turned back on. In addition
@@ -377,7 +377,7 @@ static void disable_sync_clock(void *dummy)
  */
 static void enable_sync_clock(void)
 {
-       atomic_t *sw_ptr = &__get_cpu_var(clock_sync_word);
+       atomic_t *sw_ptr = this_cpu_ptr(&clock_sync_word);
        atomic_set_mask(0x80000000, sw_ptr);
 }