---

yaml --- r: 250556 b: refs/heads/master c: 5f420c5 h: refs/heads/master v: v3
git-mirror · May 23, 2011 · ee9eaea · ee9eaea
1 parent be2be5d
commit ee9eaea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcdd65b0e7bbbd6aef9be2f20e7c238759cf0b41
+refs/heads/master: 5f420c5bd15c948302aafd3341903bc06895f1bb
diff --git a/trunk/arch/s390/oprofile/hwsampler.c b/trunk/arch/s390/oprofile/hwsampler.c
@@ -675,18 +675,11 @@ int hwsampler_activate(unsigned int cpu)
 static void hws_ext_handler(unsigned int ext_int_code,
 			    unsigned int param32, unsigned long param64)
 {
-	int cpu;
 	struct hws_cpu_buffer *cb;
 
 	kstat_cpu(smp_processor_id()).irqs[EXTINT_CPM]++;
-	cpu = smp_processor_id();
-	cb = &per_cpu(sampler_cpu_buffer, cpu);
-
-	atomic_xchg(
-			&cb->ext_params,
-			atomic_read(&cb->ext_params)
-				| S390_lowcore.ext_params);
-
+	cb = &__get_cpu_var(sampler_cpu_buffer);
+	atomic_xchg(&cb->ext_params, atomic_read(&cb->ext_params) | param32);
 	if (hws_wq)
 		queue_work(hws_wq, &cb->worker);
 }