From patchwork Mon Jul 28 07:50:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 34344 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7EEBD20AE8 for ; Mon, 28 Jul 2014 07:50:25 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf49336977oac.1 for ; Mon, 28 Jul 2014 00:50:25 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=L0mDJarV7w6qlwzpqtrhQx2Xy2vdwy2B5RVCP9AKPxw=; b=OaxZ/PrINd00t9tpvK4ZwVfbT3nLF+2MlBmZQZk2MT6Gps8gvXbLjraERvsCrOynVg UQrxAUm2LJIk3ZkZ4Lc5u/1WDNA/qPsB9ZqfzJ6W5INxB/Nc4I5kJM3HsF36wMOcX/4P VrfGJYZ/eD3Gtw9C/rOizNzmpvGpYK4Y4i+fUVd/hKfbgEfAKMF6dQEVdDTzIIt9wL5i PZ2gJ3h8D05H94nznODR5gUPLWiHNaxp0JGi8nFuKHug72egxQuKJ6B1/2QksuENlZWU FlVB8ddRFXJaauKHQ9eCepAWSkKbBlDyFvQZc8iWvQLfxOvA5vk1V56kJhVtEasjPWlB LkRQ== X-Gm-Message-State: ALoCoQlnmr88dnaS5PnlCxgBYd/3YZdoyAJQ/gP9j3cVnjdzgLMqxA3292tU0X4IkBei0KypHeIh X-Received: by 10.43.153.196 with SMTP id lb4mr23969118icc.2.1406533825082; Mon, 28 Jul 2014 00:50:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.199 with SMTP id k65ls1049582qge.3.gmail; Mon, 28 Jul 2014 00:50:24 -0700 (PDT) X-Received: by 10.52.141.76 with SMTP id rm12mr206337vdb.71.1406533824875; Mon, 28 Jul 2014 00:50:24 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id oc9si11960100vcb.105.2014.07.28.00.50.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 00:50:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so10611182vcb.33 for ; Mon, 28 Jul 2014 00:50:24 -0700 (PDT) X-Received: by 10.52.148.2 with SMTP id to2mr35863146vdb.38.1406533824799; Mon, 28 Jul 2014 00:50:24 -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 tc5csp146474vcb; Mon, 28 Jul 2014 00:50:24 -0700 (PDT) X-Received: by 10.70.53.232 with SMTP id e8mr36742296pdp.30.1406533823986; Mon, 28 Jul 2014 00:50:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iq4si16931615pbb.75.2014.07.28.00.50.19 for ; Mon, 28 Jul 2014 00:50:20 -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 S1751905AbaG1HuO (ORCPT + 21 others); Mon, 28 Jul 2014 03:50:14 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:51636 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751766AbaG1HuI (ORCPT ); Mon, 28 Jul 2014 03:50:08 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.82) (envelope-from ) id 1XBfh7-0002Am-5f; Mon, 28 Jul 2014 09:50:05 +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 added to the 3.12 stable tree] serial: sirf: Fix compilation failure Date: Mon, 28 Jul 2014 09:50:05 +0200 Message-Id: <1406533805-8321-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.0.1 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.174 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 This patch has been added to the 3.12 stable tree. If you have any objections, please let us 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);