[kernel] r16369 - dists/sid/linux-2.6/debian/patches/debian
Ben Hutchings
benh at alioth.debian.org
Wed Sep 29 02:33:52 UTC 2010
Author: benh
Date: Wed Sep 29 02:33:47 2010
New Revision: 16369
Log:
Hide an unimportant change from genksyms
Modified:
dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-from-suspend-fix.patch
Modified: dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-from-suspend-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-from-suspend-fix.patch Wed Sep 29 01:58:11 2010 (r16368)
+++ dists/sid/linux-2.6/debian/patches/debian/mmc-Avoid-ABI-change-from-suspend-fix.patch Wed Sep 29 02:33:47 2010 (r16369)
@@ -1,4 +1,3 @@
-From 82d9e0d0eb18aced617151c595d3d6c40d8991d5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Tue, 28 Sep 2010 02:52:32 +0100
Subject: [PATCH 2/2] mmc: Avoid ABI change from suspend fix
@@ -8,9 +7,9 @@
Move pm_notify in front of the public struct mmc_host.
---
drivers/mmc/core/core.c | 4 ++--
- drivers/mmc/core/host.c | 16 +++++++++-------
+ drivers/mmc/core/host.c | 18 +++++++++++-------
include/linux/mmc/host.h | 12 ++++++++++--
- 3 files changed, 21 insertions(+), 11 deletions(-)
+ 3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 46f6157..e5e62be 100644
@@ -28,10 +27,20 @@
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
-index b88fc3d..796eea5 100644
+index b88fc3d..f60f735 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
-@@ -28,7 +28,7 @@
+@@ -16,7 +16,9 @@
+ #include <linux/idr.h>
+ #include <linux/pagemap.h>
+ #include <linux/leds.h>
++#ifndef __GENKSYMS__
+ #include <linux/suspend.h>
++#endif
+
+ #include <linux/mmc/host.h>
+
+@@ -28,7 +30,7 @@
static void mmc_host_classdev_release(struct device *dev)
{
struct mmc_host *host = cls_dev_to_mmc_host(dev);
@@ -40,7 +49,7 @@
}
static struct class mmc_host_class = {
-@@ -60,13 +60,15 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -60,13 +62,15 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
{
int err;
struct mmc_host *host;
@@ -58,7 +67,7 @@
spin_lock(&mmc_host_lock);
err = idr_get_new(&mmc_host_idr, host, &host->index);
-@@ -85,7 +87,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -85,7 +89,7 @@ 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);
@@ -67,7 +76,7 @@
/*
* By default, hosts do not support SGIO or large requests.
-@@ -102,7 +104,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -102,7 +106,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
return host;
free:
@@ -76,7 +85,7 @@
return NULL;
}
-@@ -134,7 +136,7 @@ int mmc_add_host(struct mmc_host *host)
+@@ -134,7 +138,7 @@ int mmc_add_host(struct mmc_host *host)
#endif
mmc_start_host(host);
@@ -85,7 +94,7 @@
return 0;
}
-@@ -151,7 +153,7 @@ EXPORT_SYMBOL(mmc_add_host);
+@@ -151,7 +155,7 @@ EXPORT_SYMBOL(mmc_add_host);
*/
void mmc_remove_host(struct mmc_host *host)
{
More information about the Kernel-svn-changes
mailing list