From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20090225150832.061592948@de.ibm.com> References: <20090225150622.529143164@de.ibm.com> Date: Wed, 25 Feb 2009 16:06:40 +0100 From: Martin Schwidefsky Subject: [patch/s390 18/46] ftrace: dont trace machine check handler Content-Disposition: inline; filename=117-ftrace-notrace.diff Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Martin Schwidefsky List-ID: From: Heiko Carstens The ftrace code is currently not reentrant, so we better don't trace our machine check handler. Machine checks are handled like NMIs on s390. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- drivers/s390/s390mach.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: quilt-2.6/drivers/s390/s390mach.c =================================================================== --- quilt-2.6.orig/drivers/s390/s390mach.c +++ quilt-2.6/drivers/s390/s390mach.c @@ -357,8 +357,7 @@ s390_revalidate_registers(struct mci *mc /* * machine check handler. */ -void -s390_do_machine_check(struct pt_regs *regs) +void notrace s390_do_machine_check(struct pt_regs *regs) { static DEFINE_SPINLOCK(ipd_lock); static unsigned long long last_ipd; -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.