Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (38 commits)
  [S390] SPIN_LOCK_UNLOCKED cleanup in drivers/s390
  [S390] Clean up smp code in preparation for some larger changes.
  [S390] Remove debugging junk.
  [S390] Switch etr from tasklet to workqueue.
  [S390] split page_test_and_clear_dirty.
  [S390] Processor degradation notification.
  [S390] vtime: cleanup per_cpu usage.
  [S390] crypto: cleanup.
  [S390] sclp: fix coding style.
  [S390] vmlogrdr: stop IUCV connection in vmlogrdr_release.
  [S390] sclp: initialize early.
  [S390] ctc: kmalloc->kzalloc/casting cleanups.
  [S390] zfcpdump support.
  [S390] dasd: Add ipldev parameter.
  [S390] dasd: Add sysfs attribute status and generate uevents.
  [S390] Improved kernel stack overflow checking.
  [S390] Get rid of console setup functions.
  [S390] No execute support cleanup.
  [S390] Minor fault path optimization.
  [S390] Use generic bug.
  ...

1 files changed, 7 insertions, 9 deletions

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 9d5b02801b46..1e1a6ee2cac1 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -128,7 +128,7 @@ static inline void set_vtimer(__u64 expires)
         S390_lowcore.last_update_timer = expires;
 
         /* store expire time for this CPU timer */
-        per_cpu(virt_cpu_timer, smp_processor_id()).to_expire = expires;
+        __get_cpu_var(virt_cpu_timer).to_expire = expires;
 }
 #else
 static inline void set_vtimer(__u64 expires)
@@ -137,7 +137,7 @@ static inline void set_vtimer(__u64 expires)
         asm volatile ("SPT %0" : : "m" (S390_lowcore.last_update_timer));
 
         /* store expire time for this CPU timer */
-        per_cpu(virt_cpu_timer, smp_processor_id()).to_expire = expires;
+        __get_cpu_var(virt_cpu_timer).to_expire = expires;
 }
 #endif
 
@@ -145,7 +145,7 @@ static void start_cpu_timer(void)
 {
         struct vtimer_queue *vt_list;
 
-        vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
+        vt_list = &__get_cpu_var(virt_cpu_timer);
 
         /* CPU timer interrupt is pending, don't reprogramm it */
         if (vt_list->idle & 1LL<<63)
@@ -159,7 +159,7 @@ static void stop_cpu_timer(void)
 {
         struct vtimer_queue *vt_list;
 
-        vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
+        vt_list = &__get_cpu_var(virt_cpu_timer);
 
         /* nothing to do */
         if (list_empty(&vt_list->list)) {
@@ -219,7 +219,7 @@ static void do_callbacks(struct list_head *cb_list)
         if (list_empty(cb_list))
                 return;
 
-        vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
+        vt_list = &__get_cpu_var(virt_cpu_timer);
 
         list_for_each_entry_safe(event, tmp, cb_list, entry) {
                 fn = event->function;
@@ -244,7 +244,6 @@ static void do_callbacks(struct list_head *cb_list)
  */
 static void do_cpu_timer_interrupt(__u16 error_code)
 {
-        int cpu;
         __u64 next, delta;
         struct vtimer_queue *vt_list;
         struct vtimer_list *event, *tmp;
@@ -253,8 +252,7 @@ static void do_cpu_timer_interrupt(__u16 error_code)
         struct list_head cb_list;
 
         INIT_LIST_HEAD(&cb_list);
-        cpu = smp_processor_id();
-        vt_list = &per_cpu(virt_cpu_timer, cpu);
+        vt_list = &__get_cpu_var(virt_cpu_timer);
 
         /* walk timer list, fire all expired events */
         spin_lock(&vt_list->lock);
@@ -534,7 +532,7 @@ void init_cpu_vtimer(void)
         /* enable cpu timer interrupts */
         __ctl_set_bit(0,10);
 
-        vt_list = &per_cpu(virt_cpu_timer, smp_processor_id());
+        vt_list = &__get_cpu_var(virt_cpu_timer);
         INIT_LIST_HEAD(&vt_list->list);
         spin_lock_init(&vt_list->lock);
         vt_list->to_expire = 0;