diff for duplicates of <201110220110.36832.rjw@sisk.pl> diff --git a/a/1.txt b/N1/1.txt index a872025..5e1c105 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> 5 files changed, 109 insertions(+), 11 deletions(-) Index: linux/include/linux/pm_domain.h -=================================--- linux.orig/include/linux/pm_domain.h +=================================================================== +--- linux.orig/include/linux/pm_domain.h +++ linux/include/linux/pm_domain.h @@ -21,6 +21,7 @@ enum gpd_status { @@ -105,7 +106,8 @@ Index: linux/include/linux/pm_domain.h #ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME Index: linux/drivers/base/power/domain.c -=================================--- linux.orig/drivers/base/power/domain.c +=================================================================== +--- linux.orig/drivers/base/power/domain.c +++ linux/drivers/base/power/domain.c @@ -21,7 +21,7 @@ static DEFINE_MUTEX(gpd_list_lock); @@ -182,7 +184,8 @@ Index: linux/drivers/base/power/domain.c out: genpd_release_lock(genpd); Index: linux/drivers/base/power/Makefile -=================================--- linux.orig/drivers/base/power/Makefile +=================================================================== +--- linux.orig/drivers/base/power/Makefile +++ linux/drivers/base/power/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_PM_SLEEP) += main.o wakeup. obj-$(CONFIG_PM_RUNTIME) += runtime.o @@ -194,7 +197,8 @@ Index: linux/drivers/base/power/Makefile ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG Index: linux/drivers/base/power/domain_governor.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux/drivers/base/power/domain_governor.c @@ -0,0 +1,40 @@ +/* @@ -225,7 +229,7 @@ Index: linux/drivers/base/power/domain_governor.c + constraint = dev_pm_qos_read_value(dev); + if (constraint < 0) + return false; -+ else if (constraint = 0) /* 0 means "don't care" */ ++ else if (constraint == 0) /* 0 means "don't care" */ + return true; + + constraint_ns = constraint; @@ -238,7 +242,8 @@ Index: linux/drivers/base/power/domain_governor.c + .stop_ok = default_stop_ok, +}; Index: linux/arch/arm/mach-shmobile/pm-sh7372.c -=================================--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c +=================================================================== +--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c +++ linux/arch/arm/mach-shmobile/pm-sh7372.c @@ -161,13 +161,15 @@ static bool sh7372_power_down_forbidden( diff --git a/a/content_digest b/N1/content_digest index e555473..e1777fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201110220109.52991.rjw@sisk.pl\0" "From\0Rafael J. Wysocki <rjw@sisk.pl>\0" "Subject\0[RFC][PATCH 1/2] PM / Domains: Add device stop governor function (v2)\0" - "Date\0Fri, 21 Oct 2011 23:10:36 +0000\0" + "Date\0Sat, 22 Oct 2011 01:10:36 +0200\0" "To\0Linux PM list <linux-pm@vger.kernel.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Linux-sh list <linux-sh@vger.kernel.org> @@ -25,7 +25,8 @@ " 5 files changed, 109 insertions(+), 11 deletions(-)\n" "\n" "Index: linux/include/linux/pm_domain.h\n" - "=================================--- linux.orig/include/linux/pm_domain.h\n" + "===================================================================\n" + "--- linux.orig/include/linux/pm_domain.h\n" "+++ linux/include/linux/pm_domain.h\n" "@@ -21,6 +21,7 @@ enum gpd_status {\n" " \n" @@ -116,7 +117,8 @@ " \n" " #ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME\n" "Index: linux/drivers/base/power/domain.c\n" - "=================================--- linux.orig/drivers/base/power/domain.c\n" + "===================================================================\n" + "--- linux.orig/drivers/base/power/domain.c\n" "+++ linux/drivers/base/power/domain.c\n" "@@ -21,7 +21,7 @@ static DEFINE_MUTEX(gpd_list_lock);\n" " \n" @@ -193,7 +195,8 @@ " out:\n" " \tgenpd_release_lock(genpd);\n" "Index: linux/drivers/base/power/Makefile\n" - "=================================--- linux.orig/drivers/base/power/Makefile\n" + "===================================================================\n" + "--- linux.orig/drivers/base/power/Makefile\n" "+++ linux/drivers/base/power/Makefile\n" "@@ -3,7 +3,7 @@ obj-$(CONFIG_PM_SLEEP)\t+= main.o wakeup.\n" " obj-$(CONFIG_PM_RUNTIME)\t+= runtime.o\n" @@ -205,7 +208,8 @@ " \n" " ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG\n" "Index: linux/drivers/base/power/domain_governor.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux/drivers/base/power/domain_governor.c\n" "@@ -0,0 +1,40 @@\n" "+/*\n" @@ -236,7 +240,7 @@ "+\tconstraint = dev_pm_qos_read_value(dev);\n" "+\tif (constraint < 0)\n" "+\t\treturn false;\n" - "+\telse if (constraint = 0) /* 0 means \"don't care\" */\n" + "+\telse if (constraint == 0) /* 0 means \"don't care\" */\n" "+\t\treturn true;\n" "+\n" "+\tconstraint_ns = constraint;\n" @@ -249,7 +253,8 @@ "+\t.stop_ok = default_stop_ok,\n" "+};\n" "Index: linux/arch/arm/mach-shmobile/pm-sh7372.c\n" - "=================================--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c\n" + "===================================================================\n" + "--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c\n" "+++ linux/arch/arm/mach-shmobile/pm-sh7372.c\n" "@@ -161,13 +161,15 @@ static bool sh7372_power_down_forbidden(\n" " \n" @@ -269,4 +274,4 @@ " \tgenpd->start_device = pm_clk_resume;\n" " \tgenpd->dev_irq_safe = true;" -b0f0bc3ac8ec4477efad8603e961d2d49d1ea6936d25b590735c3edda62a3e78 +42104426d242b813b6feb48ddcc1984087e02ec067991c2e308806237b0b0a11
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.