The patch titled
PM: export device_pm_schedule_removal
has been removed from the -mm tree. Its filename was
pm-export-device_pm_schedule_removal.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: PM: export device_pm_schedule_removal
From: Rafael J. Wysocki <rjw@xxxxxxx>
The following series of patches is intended to fix the suspend/resume deadlock
occuring as a result of unregistering device objects, locked by the PM core,
during suspend/resume cycles by the b43 driver.
In short, the b43 driver is modified to avoid unregistering device objects
during suspend/resume cycles except for the resume code path, in which the
devices are unregistered using the recently introduced suspend-safe method.
For this purpose, it is necessary to introduce the possibility to safely
remove misc devices, leds classdevs and hwrng devices during suspend/resume
cycles (patches 2/5, 4/5, 3/5, respectively).
This patch:
Move the declaration of device_pm_schedule_removal() to device.h and make it
exported, as it will be used directly by some drivers for unregistering device
objects during suspend/resume cycles in a safe way.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Michael Buesch <mb@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/power/main.c | 1 +
drivers/base/power/power.h | 1 -
include/linux/device.h | 6 ++++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/base/power/main.c~pm-export-device_pm_schedule_removal drivers/base/power/main.c
--- a/drivers/base/power/main.c~pm-export-device_pm_schedule_removal
+++ a/drivers/base/power/main.c
@@ -129,6 +129,7 @@ void device_pm_schedule_removal(struct d
list_move_tail(&dev->power.entry, &dpm_destroy);
mutex_unlock(&dpm_list_mtx);
}
+EXPORT_SYMBOL_GPL(device_pm_schedule_removal);
/**
* pm_sleep_lock - mutual exclusion for registration and suspend
diff -puN drivers/base/power/power.h~pm-export-device_pm_schedule_removal drivers/base/power/power.h
--- a/drivers/base/power/power.h~pm-export-device_pm_schedule_removal
+++ a/drivers/base/power/power.h
@@ -13,7 +13,6 @@ static inline struct device *to_device(s
extern void device_pm_add(struct device *);
extern void device_pm_remove(struct device *);
-extern void device_pm_schedule_removal(struct device *);
extern int pm_sleep_lock(void);
extern void pm_sleep_unlock(void);
diff -puN include/linux/device.h~pm-export-device_pm_schedule_removal include/linux/device.h
--- a/include/linux/device.h~pm-export-device_pm_schedule_removal
+++ a/include/linux/device.h
@@ -532,11 +532,17 @@ extern struct device *device_create(stru
extern void device_destroy(struct class *cls, dev_t devt);
#ifdef CONFIG_PM_SLEEP
extern void destroy_suspended_device(struct class *cls, dev_t devt);
+extern void device_pm_schedule_removal(struct device *);
#else /* !CONFIG_PM_SLEEP */
static inline void destroy_suspended_device(struct class *cls, dev_t devt)
{
device_destroy(cls, devt);
}
+
+static inline void device_pm_schedule_removal(struct device *dev)
+{
+ device_unregister(dev);
+}
#endif /* !CONFIG_PM_SLEEP */
/*
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
git-acpi.patch
gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi.patch
git-x86.patch
git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3.patch
git-xfs.patch
page-allocator-clean-up-pcp-draining-functions.patch
page-allocator-clean-up-pcp-draining-functions-swsusp-fix.patch
page-allocator-clean-up-pcp-draining-functions-swsusp-fix-fix.patch
kernel-power-diskc-make-code-static.patch
make-kernel_shutdown_prepare-static.patch
misc-add-possibility-to-remove-misc-devices-during-suspend-resume.patch
hwrng-add-possibility-to-remove-hwrng-devices-during-suspend-resume.patch
leds-add-possibility-to-remove-leds-classdevs-during-suspend-resume.patch
b43-avoid-unregistering-device-objects-during-suspend.patch
proc-fix-the-threaded-proc-self.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
