Skip to contentSkip to conversation

v2 [patch 0/1] hwsampler_shutdown

DISCUSSION Heinz Graalfs 1 participant 2 messages Mar 30, 2011 s390

lore
Share & tools
lore

Heinz Graalfs

author
#0 lore raw

Hello Robert,

yes, and you are right we should reset hws_state to zero.

Heinz

author
#1 lore raw

v2 [patch 1/1] Do not unregister_cpu_notifier in case of wrong state

From: Heinz Graalfs <[email protected]>

This patch avoids calling unregister_cpu_notifier() in case hwsampler_shutdown() is invoked in wrong state.

---
 arch/s390/oprofile/hwsampler.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/s390/oprofile/hwsampler.c +7 -4
Index: 2.6.39/arch/s390/oprofile/hwsampler.c
===================================================================
@@ -1142,12 +1142,15 @@ int hwsampler_shutdown()
 		}
 
 		unregister_external_interrupt(0x1407, hws_ext_handler);
-		hws_state = HWS_INIT;
+		hws_state = 0;
+
+		mutex_unlock(&hws_sem);
+		unregister_cpu_notifier(&hws_cpu_notifier);
+
 		rc = 0;
+	} else {
+		mutex_unlock(&hws_sem);
 	}
-	mutex_unlock(&hws_sem);
-
-	unregister_cpu_notifier(&hws_cpu_notifier);
 
 	return rc;
 }