From patchwork Mon Aug 2 22:56:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 176232 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Mon, 02 Aug 2010 23:57:22 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1Og3wf-00006F-10 for chris@printf.net; Mon, 02 Aug 2010 23:57:21 +0100 Received: by mail.laptop.org (Postfix) id 8EB2123A6E; Mon, 2 Aug 2010 18:57:03 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 7E3DD23A6D for ; Mon, 2 Aug 2010 18:57:03 -0400 (EDT) X-ASG-Debug-ID: 1280789839-3563f8440001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id pvw5BuZqqWNHDajW for ; Mon, 02 Aug 2010 18:57:19 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754412Ab0HBW5Q (ORCPT ); Mon, 2 Aug 2010 18:57:16 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:54296 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754370Ab0HBW5P (ORCPT ); Mon, 2 Aug 2010 18:57:15 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o72Muaeu013507 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 2 Aug 2010 15:56:37 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o72MuZJh016384; Mon, 2 Aug 2010 15:56:35 -0700 Message-Id: <201008022256.o72MuZJh016384@imap1.linux-foundation.org> X-ASG-Orig-Subj: + mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2.patch added to -mm tree Subject: + mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: maximlevitsky@gmail.com, david-b@pacbell.net, linux-mmc@vger.kernel.org, stern@rowland.harvard.edu From: akpm@linux-foundation.org Date: Mon, 02 Aug 2010 15:56:35 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1280789839 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.36855 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/core/core.c~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 +++ a/drivers/mmc/core/core.c @@ -1323,6 +1323,7 @@ int mmc_resume_host(struct mmc_host *hos return err; } +EXPORT_SYMBOL(mmc_resume_host); /* Do the card removal on suspend if card is assumed removeable * Do that in pm notifier while userspace isn't yet frozen, so we will be able @@ -1343,6 +1344,7 @@ int mmc_pm_notify(struct notifier_block spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 1; spin_unlock_irqrestore(&host->lock, flags); + cancel_delayed_work_sync(&host->detect); if (!host->bus_ops || host->bus_ops->suspend) break; @@ -1369,8 +1371,6 @@ int mmc_pm_notify(struct notifier_block return 0; } -EXPORT_SYMBOL(mmc_resume_host); - #endif static int __init mmc_init(void) diff -puN drivers/mmc/core/host.c~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 drivers/mmc/core/host.c --- a/drivers/mmc/core/host.c~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 +++ a/drivers/mmc/core/host.c @@ -88,7 +88,6 @@ struct mmc_host *mmc_alloc_host(int extr INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable); host->pm_notify.notifier_call = mmc_pm_notify; - /* * By default, hosts do not support SGIO or large requests. * They have to set these according to their abilities. diff -puN include/linux/mmc/host.h~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 include/linux/mmc/host.h --- a/include/linux/mmc/host.h~mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-update-2 +++ a/include/linux/mmc/host.h @@ -261,7 +261,6 @@ int mmc_host_disable(struct mmc_host *ho int mmc_host_lazy_disable(struct mmc_host *host); int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *); - static inline void mmc_set_disable_delay(struct mmc_host *host, unsigned int disable_delay) {