From patchwork Wed Sep 8 22:06:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Rigby X-Patchwork-Id: 64233 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D9DADB6EDD for ; Thu, 9 Sep 2010 08:06:54 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OtSn2-0004yD-54; Wed, 08 Sep 2010 23:06:48 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OtSn0-0004y8-ND for kernel-team@lists.ubuntu.com; Wed, 08 Sep 2010 23:06:46 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OtSn0-0002TJ-L2; Wed, 08 Sep 2010 23:06:46 +0100 Received: from c-98-202-243-83.hsd1.ut.comcast.net ([98.202.243.83] helo=[192.168.1.2]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OtSn0-0005mb-CQ; Wed, 08 Sep 2010 23:06:46 +0100 Message-ID: <4C8808F9.8040001@canonical.com> Date: Wed, 08 Sep 2010 16:06:49 -0600 From: John Rigby User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 MIME-Version: 1.0 To: Leann Ogasawara Subject: Re: [APPLIED] Re: [Maverick] pull-request: mmc: fix all hangs related to mmc/sd card insert/removal during References: <4C7FB27D.7010509@canonical.com> <1283478095.7530.4600.camel@emiko> In-Reply-To: <1283478095.7530.4600.camel@emiko> Cc: kernel-team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch causes build breakage if CONFIG_PM=n. Upstream fix below. From c97526d61aa4457e349a6e0086c02914c88f6873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 18 Aug 2010 09:25:38 -0700 Subject: [PATCH] mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume") Cc: David Brownell Cc: Alan Stern Cc: linux-mmc@vger.kernel.org Cc: Andrew Morton Signed-off-by: Uwe Kleine-König Acked-by: Kukjin Kim Acked-by: Maxim Levitsky Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds (cherry picked from commit 81ca03a0e2ea0207b2df80e0edcf4c775c07a505) --- drivers/mmc/core/host.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) /* * By default, hosts do not support SGIO or large requests. diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 0efe631..d80cfdc 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) init_waitqueue_head(&host->wq); INIT_DELAYED_WORK(&host->detect, mmc_rescan); INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable); +#ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; +#endif