From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20110329125433.258166605@linux.vnet.ibm.com> Date: Tue, 29 Mar 2011 14:48:26 +0200 From: Heinz Graalfs Subject: [patch 1/1] Do not unregister_cpu_notifier in case of wrong state References: <20110329124825.027309213@linux.vnet.ibm.com> Content-Disposition: inline; filename=hwsampler-shutdown.patch Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: robert.richter@amd.com Cc: mingo@elte.hu, oprofile-list@lists.sf.net, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com List-ID: From: Heinz Graalfs This patch avoids calling unregister_cpu_notifier() in case hwsampler_shutdown() is invoked in wrong state. --- arch/s390/oprofile/hwsampler.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: 2.6.39/arch/s390/oprofile/hwsampler.c =================================================================== --- 2.6.39.orig/arch/s390/oprofile/hwsampler.c +++ 2.6.39/arch/s390/oprofile/hwsampler.c @@ -1143,11 +1143,14 @@ int hwsampler_shutdown() unregister_external_interrupt(0x1407, hws_ext_handler); hws_state = HWS_INIT; + + 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; }