From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: [PATCH] arm: arm: fiq: fix build breakage with CONFIG_FIQ Date: Wed, 17 Sep 2014 15:01:41 -0500 Message-ID: <1410984101-16762-1-git-send-email-balbi@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:36897 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757181AbaIQUCp (ORCPT ); Wed, 17 Sep 2014 16:02:45 -0400 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Russell King Cc: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi , Daniel Thompson , Catalin Marinas , Nicolas Pitre commit e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) has a typo which causes build breakage whenever CONFIG_FIQ is set. The bug is very clear as can be noted that a new struct pt_regs def_fiq_regs was defined but code uses dfl_fiq_regs. Cc: Daniel Thompson Cc: Catalin Marinas Cc: Nicolas Pitre Fixes: e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) Signed-off-by: Felipe Balbi --- KernelVersion: next-20140917 Russell, let me know if this is the correct KernelVersion tag you want/need arch/arm/kernel/fiq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c index 1743049..b6ab4c7 100644 --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c @@ -64,7 +64,7 @@ static int fiq_def_op(void *ref, int relinquish) if (!relinquish) { /* Restore default handler and registers */ local_fiq_disable(); - set_fiq_regs(&dfl_fiq_regs); + set_fiq_regs(&def_fiq_regs); set_fiq_handler(&no_fiq_insn, sizeof(no_fiq_insn)); local_fiq_enable(); @@ -159,6 +159,6 @@ void __init init_FIQ(int start) { unsigned offset = FIQ_OFFSET; no_fiq_insn = *(unsigned long *)(0xffff0000 + offset); - get_fiq_regs(&dfl_fiq_regs); + get_fiq_regs(&def_fiq_regs); fiq_start = start; } -- 2.1.0.243.g30d45f7