From patchwork Wed Sep 17 20:01:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 4926451 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0661F9F3EC for ; Wed, 17 Sep 2014 20:01:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B5F02015E for ; Wed, 17 Sep 2014 20:02:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7592520117 for ; Wed, 17 Sep 2014 20:02:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757185AbaIQUCr (ORCPT ); Wed, 17 Sep 2014 16:02:47 -0400 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 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8HK24iQ015135; Wed, 17 Sep 2014 15:02:04 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8HK24MU004604; Wed, 17 Sep 2014 15:02:04 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Wed, 17 Sep 2014 15:02:04 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8HK23a5023726; Wed, 17 Sep 2014 15:02:03 -0500 From: Felipe Balbi To: Russell King CC: Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi , Daniel Thompson , Catalin Marinas , Nicolas Pitre 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> X-Mailer: git-send-email 2.1.0.243.g30d45f7 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }