diff for duplicates of <20131031062958.576361964@linux.com> diff --git a/a/1.txt b/N1/1.txt index 8fd4675..dd2e15d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,77 +1,3 @@ -From: Domenico Andreoli <domenico.andreoli@linux.com> - -Proof of concept: ARM as a consumer of the machine reset hooks. - -Cc: Russell King <linux@arm.linux.org.uk> -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: Olof Johansson <olof@lixom.net> -Cc: Will Deacon <will.deacon@arm.com> -Cc: linux-arch@vger.kernel.org -Cc: linux-arm-kernel@lists.infradead.org -Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com> ---- - arch/arm/kernel/process.c | 14 ++++++++------ - kernel/power/Kconfig | 1 + - 2 files changed, 9 insertions(+), 6 deletions(-) - -Index: b/arch/arm/kernel/process.c -=================================================================== ---- a/arch/arm/kernel/process.c -+++ b/arch/arm/kernel/process.c -@@ -33,6 +33,7 @@ - #include <linux/cpuidle.h> - #include <linux/leds.h> - #include <linux/reboot.h> -+#include <linux/machine_reset.h> - - #include <asm/cacheflush.h> - #include <asm/idmap.h> -@@ -114,17 +115,13 @@ void soft_restart(unsigned long addr) - BUG(); - } - --static void null_restart(enum reboot_mode reboot_mode, const char *cmd) --{ --} -- - /* - * Function pointers to optional machine specific functions - */ - void (*pm_power_off)(void); - EXPORT_SYMBOL(pm_power_off); - --void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd) = null_restart; -+void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - EXPORT_SYMBOL_GPL(arm_pm_restart); - - /* -@@ -217,6 +214,8 @@ void machine_power_off(void) - - if (pm_power_off) - pm_power_off(); -+ else -+ default_power_off(); - } - - /* -@@ -235,7 +234,10 @@ void machine_restart(char *cmd) - local_irq_disable(); - smp_send_stop(); - -- arm_pm_restart(reboot_mode, cmd); -+ if (arm_pm_restart) -+ arm_pm_restart(reboot_mode, cmd); -+ else -+ default_restart(reboot_mode, cmd); - - /* Give a grace period for failure to restart of 1s */ - mdelay(1000); -Index: b/kernel/power/Kconfig -=================================================================== ---- a/kernel/power/Kconfig -+++ b/kernel/power/Kconfig -@@ -297,3 +297,4 @@ config CPU_PM - config MACHINE_RESET - bool - default n -+ depends on ARM +An embedded and charset-unspecified text was scrubbed... +Name: arm-machine-reset.patch +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131031/11f22cfc/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index 4fed733..b1dc5a6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,95 +1,12 @@ "ref\020131031062708.520968323@linux.com\0" - "From\0Domenico Andreoli <domenico.andreoli@linux.com>\0" + "From\0domenico.andreoli@linux.com (Domenico Andreoli)\0" "Subject\0[PATCH 02/11] ARM: use the common machine reset handling\0" "Date\0Thu, 31 Oct 2013 07:27:10 +0100\0" - "To\0linux-arch@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-mips@lvger.kernel.org - Russell King <linux@arm.linux.org.uk> - Arnd Bergmann <arnd@arndb.de> - Olof Johansson <olof@lixom.net> - Ralf Baechle <ralf@linux-mips.org> - Will Deacon <will.deacon@arm.com> - " Domenico Andreoli <domenico.andreoli@linux.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0arm-machine-reset.patch\0" "b\0" - "From: Domenico Andreoli <domenico.andreoli@linux.com>\n" - "\n" - "Proof of concept: ARM as a consumer of the machine reset hooks.\n" - "\n" - "Cc: Russell King <linux@arm.linux.org.uk>\n" - "Cc: Arnd Bergmann <arnd@arndb.de>\n" - "Cc: Olof Johansson <olof@lixom.net>\n" - "Cc: Will Deacon <will.deacon@arm.com>\n" - "Cc: linux-arch@vger.kernel.org\n" - "Cc: linux-arm-kernel@lists.infradead.org\n" - "Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>\n" - "---\n" - " arch/arm/kernel/process.c | 14 ++++++++------\n" - " kernel/power/Kconfig | 1 +\n" - " 2 files changed, 9 insertions(+), 6 deletions(-)\n" - "\n" - "Index: b/arch/arm/kernel/process.c\n" - "===================================================================\n" - "--- a/arch/arm/kernel/process.c\n" - "+++ b/arch/arm/kernel/process.c\n" - "@@ -33,6 +33,7 @@\n" - " #include <linux/cpuidle.h>\n" - " #include <linux/leds.h>\n" - " #include <linux/reboot.h>\n" - "+#include <linux/machine_reset.h>\n" - " \n" - " #include <asm/cacheflush.h>\n" - " #include <asm/idmap.h>\n" - "@@ -114,17 +115,13 @@ void soft_restart(unsigned long addr)\n" - " \tBUG();\n" - " }\n" - " \n" - "-static void null_restart(enum reboot_mode reboot_mode, const char *cmd)\n" - "-{\n" - "-}\n" - "-\n" - " /*\n" - " * Function pointers to optional machine specific functions\n" - " */\n" - " void (*pm_power_off)(void);\n" - " EXPORT_SYMBOL(pm_power_off);\n" - " \n" - "-void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd) = null_restart;\n" - "+void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);\n" - " EXPORT_SYMBOL_GPL(arm_pm_restart);\n" - " \n" - " /*\n" - "@@ -217,6 +214,8 @@ void machine_power_off(void)\n" - " \n" - " \tif (pm_power_off)\n" - " \t\tpm_power_off();\n" - "+\telse\n" - "+\t\tdefault_power_off();\n" - " }\n" - " \n" - " /*\n" - "@@ -235,7 +234,10 @@ void machine_restart(char *cmd)\n" - " \tlocal_irq_disable();\n" - " \tsmp_send_stop();\n" - " \n" - "-\tarm_pm_restart(reboot_mode, cmd);\n" - "+\tif (arm_pm_restart)\n" - "+\t\tarm_pm_restart(reboot_mode, cmd);\n" - "+\telse\n" - "+\t\tdefault_restart(reboot_mode, cmd);\n" - " \n" - " \t/* Give a grace period for failure to restart of 1s */\n" - " \tmdelay(1000);\n" - "Index: b/kernel/power/Kconfig\n" - "===================================================================\n" - "--- a/kernel/power/Kconfig\n" - "+++ b/kernel/power/Kconfig\n" - "@@ -297,3 +297,4 @@ config CPU_PM\n" - " config MACHINE_RESET\n" - " \tbool\n" - " \tdefault n\n" - "+\tdepends on ARM" + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: arm-machine-reset.patch\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131031/11f22cfc/attachment.ksh> -3faeec01f7b3ce584e1ec65e7b87dd68c05576e19c88ace9728d0b5a3f6664de +9fd6152c97b381df7a5318d7a1e1e9f8d49079903409a578e6f93fc4355ac808
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.