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: 37538 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77D7E2057E for ; Wed, 17 Sep 2014 20:02:56 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id u57sf1168948wes.7 for ; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=dsshVim67F8Vnm5GsQhLL7jkkpzjJVmTMHPgUjwBAeM=; b=FWDAq+l+kQEQqlUqdzagxHefKiI1MeZtYhG2H8PDNVQ7+iFZHyQhQ18PbDzn/dfGz5 TVIIdtVM+P2YwIgBYJd67P46smeZeoKWpZBIXaCFbNv2cp3vF/VIZE7Yy+stvFuRNxLr c6LFNySeSaHMDkBgGR987LqLB2wk0ghXhMZMu9tt8ocpim4wsLonbXIvoGrwLnXyQJa1 a9nFjkeP1zVRMMm29yDu7vmP0jWwxZE88DmnJy82g27HQ5qdlVwhXYvRPNxe9+sdCfLt dY4hr5Pd+MXqK5aOO5sKj2vsrCc5nv+uljjGulxdD5OnIiqU5zR4q3teLkk+2GHjIZ2f YT+g== X-Gm-Message-State: ALoCoQkmu9Eh2jHc/twN/uCLKUiSusl91V2/kWIk/m4LAQ5xSAYToDTJrkc1Hcrv0mGbPPpU563c X-Received: by 10.194.57.237 with SMTP id l13mr8374wjq.7.1410984175637; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.169 with SMTP id k9ls157486laa.91.gmail; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) X-Received: by 10.112.236.105 with SMTP id ut9mr43467762lbc.17.1410984175366; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id w2si29965264lbb.75.2014.09.17.13.02.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Sep 2014 13:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id ge10so2541141lab.40 for ; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) X-Received: by 10.152.7.8 with SMTP id f8mr46140376laa.27.1410984175292; Wed, 17 Sep 2014 13:02:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp646898lbb; Wed, 17 Sep 2014 13:02:54 -0700 (PDT) X-Received: by 10.68.201.138 with SMTP id ka10mr65003785pbc.23.1410984173820; Wed, 17 Sep 2014 13:02:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i5si7673044pdb.241.2014.09.17.13.02.53 for ; Wed, 17 Sep 2014 13:02:53 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757185AbaIQUCr (ORCPT + 5 others); 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: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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; }