From patchwork Wed Jul 30 12:13:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 34519 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AB70820792 for ; Wed, 30 Jul 2014 12:45:09 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id b6sf3911248yha.5 for ; Wed, 30 Jul 2014 05:45:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=JLsRR0yKAoO1qFsBt5gG5+o765393Uwm/CEB/uy/5NQ=; b=OggLSwVQnl0E8EhiDGz7Fva7X9hVO1uIXPzvHsmHUmj85hqQDfCG7OBlsOwAZ1o/0j 5sa7udA75S9KlGo8LhEgAcUC8TnrGxrt4sorJIeIC5Ui2M6lyDpMqwD2CSmq4FEtGA97 A8H/0JtY8ws8Imsze9So5jRSRfqRo4KRWqYaYOkUVjEwfkCrfJ03mreeEhwYCV/ojPeS hBJWXUp6B0r6iGur6kf5o6keZxlFVzLqAZPstAFylUXWAZ8AsyxnDFSxvK+pkHaIBQ+w 7045VP14OjPIiGWdPKTargDbNKHbNsPHfctkHI1HnDFjrtTWb2iwbOw6e2AXjEw14gRu 4h1A== X-Gm-Message-State: ALoCoQnprjRSkYSZHGFjg6Jozdkunzlp7l22o+6d2O/8ODFSzHMSuxAiI84rF5/pFChSUnBKxqVW X-Received: by 10.236.99.8 with SMTP id w8mr1294008yhf.31.1406724309518; Wed, 30 Jul 2014 05:45:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.142 with SMTP id r14ls510554qgr.16.gmail; Wed, 30 Jul 2014 05:45:09 -0700 (PDT) X-Received: by 10.220.190.134 with SMTP id di6mr2718944vcb.43.1406724309393; Wed, 30 Jul 2014 05:45:09 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id yg2si1474627vdc.105.2014.07.30.05.45.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Jul 2014 05:45:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so1661109vcb.13 for ; Wed, 30 Jul 2014 05:45:09 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr4162251vcb.0.1406724309292; Wed, 30 Jul 2014 05:45:09 -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.221.37.5 with SMTP id tc5csp24617vcb; Wed, 30 Jul 2014 05:45:08 -0700 (PDT) X-Received: by 10.66.144.70 with SMTP id sk6mr4405971pab.90.1406724308287; Wed, 30 Jul 2014 05:45:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si2282765pas.196.2014.07.30.05.45.07 for ; Wed, 30 Jul 2014 05:45:08 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1755432AbaG3Mot (ORCPT + 26 others); Wed, 30 Jul 2014 08:44:49 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:36634 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751AbaG3MPZ (ORCPT ); Wed, 30 Jul 2014 08:15:25 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XCSmx-0003zC-Ma; Wed, 30 Jul 2014 14:15:23 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Daniel Thompson , Jiri Slaby , Qipan Li , Greg Kroah-Hartman Subject: [PATCH 3.12 04/94] serial: sirf: Fix compilation failure Date: Wed, 30 Jul 2014 14:13:53 +0200 Message-Id: X-Mailer: git-send-email 2.0.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 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: , From: Daniel Thompson 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 58eb97c99da6a82c556ddec70683eb3863d4f617 upstream. After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer possiblet to compile this driver. The rename of one of the spinlocks is faulty. After looking at the original patch I believe this is the correct fix. Compile tested using ARM's multi_v7_defconfig Reported-by: Stephen Rothwell Cc: Jiri Slaby Cc: Qipan Li Signed-off-by: Daniel Thompson Acked-by: Barry Song Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- drivers/tty/serial/sirfsoc_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index ef61908cf9c3..25aecf0fa339 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -700,7 +700,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param) struct sirfsoc_uart_port *sirfport = (struct sirfsoc_uart_port *)param; struct uart_port *port = &sirfport->port; unsigned long flags; - spin_lock_irqsave(&port->rx_lock, flags); + spin_lock_irqsave(&port->lock, flags); while (sirfport->rx_completed != sirfport->rx_issued) { sirfsoc_uart_insert_rx_buf_to_tty(sirfport, SIRFSOC_RX_DMA_BUF_SIZE);