The patch titled s2ram: warn when interrupts should be disabled but are not has been removed from the -mm tree. Its filename was s2ram-warn-when-interrupts-should-be-disabled-but-are-not.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: s2ram: warn when interrupts should be disabled but are not From: Pavel Machek <pavel@xxxxxx> sysdevs should be suspended/resumed with IRQs disabled; if something reenables them by mistake, we want to know early. Signed-off-by: Pavel Machek <pavel@xxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/base/sys.c | 3 +++ 1 file changed, 3 insertions(+) diff -puN drivers/base/sys.c~s2ram-warn-when-interrupts-should-be-disabled-but-are-not drivers/base/sys.c --- a/drivers/base/sys.c~s2ram-warn-when-interrupts-should-be-disabled-but-are-not +++ a/drivers/base/sys.c @@ -22,6 +22,7 @@ #include <linux/pm.h> #include <linux/device.h> #include <linux/mutex.h> +#include <linux/hardirq.h> #include "base.h" @@ -383,6 +384,7 @@ int sysdev_suspend(pm_message_t state) /* Call auxillary drivers first */ list_for_each_entry(drv, &cls->drivers, entry) { if (drv->suspend) { + WARN_ON(!irqs_disabled()); ret = drv->suspend(sysdev, state); if (ret) goto aux_driver; @@ -458,6 +460,7 @@ int sysdev_resume(void) list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) { pr_debug(" %s\n", kobject_name(&sysdev->kobj)); + WARN_ON(!irqs_disabled()); __sysdev_resume(sysdev); } } _ Patches currently in -mm which might be from pavel@xxxxxx are origin.patch acpi_pm_device_sleep_state-cleanup.patch s2ram-warn-when-interrupts-should-be-disabled-but-are-not.patch hci_usbh-fix-hard-to-trigger-race.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