diff for duplicates of <20220130233718.21544-5-digetx@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f0316fb..725f3cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -435,8 +435,8 @@ index 35f0cde641c1..1ae5ba86b150 100644 + +static int unregister_power_off_handler(struct notifier_block *nb) +{ -+ if (nb == pm_power_off_nb) { -+ if (pm_power_off == dummy_pm_power_off) ++ if (nb = pm_power_off_nb) { ++ if (pm_power_off = dummy_pm_power_off) + pm_power_off = NULL; + + pm_power_off_nb = NULL; @@ -576,7 +576,7 @@ index 35f0cde641c1..1ae5ba86b150 100644 + return -EBUSY; + + if (handler->power_off_cb || handler->power_off_prepare_cb) { -+ if (handler->power_off_priority == POWEROFF_PRIO_RESERVED) ++ if (handler->power_off_priority = POWEROFF_PRIO_RESERVED) + priority = POWEROFF_PRIO_DEFAULT; + else + priority = handler->power_off_priority; @@ -590,7 +590,7 @@ index 35f0cde641c1..1ae5ba86b150 100644 + } + + if (handler->restart_cb) { -+ if (handler->restart_priority == RESTART_PRIO_RESERVED) ++ if (handler->restart_priority = RESTART_PRIO_RESERVED) + priority = RESTART_PRIO_DEFAULT; + else + priority = handler->restart_priority; @@ -724,7 +724,7 @@ index 35f0cde641c1..1ae5ba86b150 100644 + if (!handler) + return -ENOMEM; + -+ if (priority == POWEROFF_PRIO_RESERVED) ++ if (priority = POWEROFF_PRIO_RESERVED) + priority = POWEROFF_PRIO_DEFAULT; + + priv = sys_off_handler_private_data(handler); @@ -763,7 +763,7 @@ index 35f0cde641c1..1ae5ba86b150 100644 + if (!handler) + return -ENOMEM; + -+ if (priority == RESTART_PRIO_RESERVED) ++ if (priority = RESTART_PRIO_RESERVED) + priority = RESTART_PRIO_DEFAULT; + + handler->restart_priority = priority; @@ -911,8 +911,8 @@ index 35f0cde641c1..1ae5ba86b150 100644 /* Instead of trying to make the power_off code look like * halt when pm_power_off is not set do it the easy way. */ -- if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) -+ if (cmd == LINUX_REBOOT_CMD_POWER_OFF && !kernel_can_power_off()) +- if ((cmd = LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) ++ if (cmd = LINUX_REBOOT_CMD_POWER_OFF && !kernel_can_power_off()) cmd = LINUX_REBOOT_CMD_HALT; mutex_lock(&system_transition_mutex); diff --git a/a/content_digest b/N1/content_digest index 9daa698..df5ed53 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020220130233718.21544-1-digetx@gmail.com\0" "From\0Dmitry Osipenko <digetx@gmail.com>\0" "Subject\0[PATCH v6 04/21] kernel: Add combined power-off+restart handler call chain API\0" - "Date\0Mon, 31 Jan 2022 02:37:01 +0300\0" + "Date\0Sun, 30 Jan 2022 23:37:01 +0000\0" "To\0Thierry Reding <thierry.reding@gmail.com>" Jonathan Hunter <jonathanh@nvidia.com> Russell King <linux@armlinux.org.uk> @@ -503,8 +503,8 @@ "+\n" "+static int unregister_power_off_handler(struct notifier_block *nb)\n" "+{\n" - "+\tif (nb == pm_power_off_nb) {\n" - "+\t\tif (pm_power_off == dummy_pm_power_off)\n" + "+\tif (nb = pm_power_off_nb) {\n" + "+\t\tif (pm_power_off = dummy_pm_power_off)\n" "+\t\t\tpm_power_off = NULL;\n" "+\n" "+\t\tpm_power_off_nb = NULL;\n" @@ -644,7 +644,7 @@ "+\t\treturn -EBUSY;\n" "+\n" "+\tif (handler->power_off_cb || handler->power_off_prepare_cb) {\n" - "+\t\tif (handler->power_off_priority == POWEROFF_PRIO_RESERVED)\n" + "+\t\tif (handler->power_off_priority = POWEROFF_PRIO_RESERVED)\n" "+\t\t\tpriority = POWEROFF_PRIO_DEFAULT;\n" "+\t\telse\n" "+\t\t\tpriority = handler->power_off_priority;\n" @@ -658,7 +658,7 @@ "+\t}\n" "+\n" "+\tif (handler->restart_cb) {\n" - "+\t\tif (handler->restart_priority == RESTART_PRIO_RESERVED)\n" + "+\t\tif (handler->restart_priority = RESTART_PRIO_RESERVED)\n" "+\t\t\tpriority = RESTART_PRIO_DEFAULT;\n" "+\t\telse\n" "+\t\t\tpriority = handler->restart_priority;\n" @@ -792,7 +792,7 @@ "+\tif (!handler)\n" "+\t\treturn -ENOMEM;\n" "+\n" - "+\tif (priority == POWEROFF_PRIO_RESERVED)\n" + "+\tif (priority = POWEROFF_PRIO_RESERVED)\n" "+\t\tpriority = POWEROFF_PRIO_DEFAULT;\n" "+\n" "+\tpriv = sys_off_handler_private_data(handler);\n" @@ -831,7 +831,7 @@ "+\tif (!handler)\n" "+\t\treturn -ENOMEM;\n" "+\n" - "+\tif (priority == RESTART_PRIO_RESERVED)\n" + "+\tif (priority = RESTART_PRIO_RESERVED)\n" "+\t\tpriority = RESTART_PRIO_DEFAULT;\n" "+\n" "+\thandler->restart_priority = priority;\n" @@ -979,12 +979,12 @@ " \t/* Instead of trying to make the power_off code look like\n" " \t * halt when pm_power_off is not set do it the easy way.\n" " \t */\n" - "-\tif ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)\n" - "+\tif (cmd == LINUX_REBOOT_CMD_POWER_OFF && !kernel_can_power_off())\n" + "-\tif ((cmd = LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)\n" + "+\tif (cmd = LINUX_REBOOT_CMD_POWER_OFF && !kernel_can_power_off())\n" " \t\tcmd = LINUX_REBOOT_CMD_HALT;\n" " \n" " \tmutex_lock(&system_transition_mutex);\n" "-- \n" 2.34.1 -ea4adef15cf383697800f9772fbd3a585f9effbbd24196d324d883a1612adaf6 +1adc9617e6305dcc29cd565ef70f88ced90481eefa32c865292ac0822e542bbe
diff --git a/a/1.txt b/N2/1.txt index f0316fb..78fc623 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -918,3 +918,9 @@ index 35f0cde641c1..1ae5ba86b150 100644 mutex_lock(&system_transition_mutex); -- 2.34.1 + + +_______________________________________________ +linux-riscv mailing list +linux-riscv@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-riscv diff --git a/a/content_digest b/N2/content_digest index 9daa698..6792db3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -985,6 +985,12 @@ " \n" " \tmutex_lock(&system_transition_mutex);\n" "-- \n" - 2.34.1 + "2.34.1\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-riscv mailing list\n" + "linux-riscv@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-riscv -ea4adef15cf383697800f9772fbd3a585f9effbbd24196d324d883a1612adaf6 +c409e1684b7583335e6a3dcbc81b06f3dbb6a0480aff8994a5eaf2d6dee0abf1
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.