From: Thierry Reding <thierry.reding@gmail.com> To: Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de> Cc: Mark Rutland <mark.rutland@arm.com>, Guenter Roeck <linux@roeck-us.net>, Stefano Stabellini <sstabellini@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] ARM64: Remove arm_pm_restart() Date: Mon, 30 Jan 2017 12:05:11 +0100 [thread overview] Message-ID: <20170130110512.6943-6-thierry.reding@gmail.com> (raw) In-Reply-To: <20170130110512.6943-1-thierry.reding@gmail.com> From: Guenter Roeck <linux@roeck-us.net> All users of arm_pm_restart() have been converted to use the kernel restart handler. Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> --- arch/arm64/include/asm/system_misc.h | 2 -- arch/arm64/kernel/process.c | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h index bc812435bc76..97398214061f 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -43,8 +43,6 @@ struct mm_struct; extern void show_pte(struct mm_struct *mm, unsigned long addr); extern void __show_regs(struct pt_regs *); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - #define show_unhandled_signals_ratelimited() \ ({ \ static DEFINE_RATELIMIT_STATE(_rs, \ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 0b07d42819da..138918269b3a 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -68,8 +68,6 @@ EXPORT_SYMBOL(__stack_chk_guard); void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); -void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - /* * This is our default idle handler. */ @@ -155,10 +153,7 @@ void machine_restart(char *cmd) efi_reboot(reboot_mode, NULL); /* Now call the architecture specific reboot code. */ - if (arm_pm_restart) - arm_pm_restart(reboot_mode, cmd); - else - do_kernel_restart(cmd); + do_kernel_restart(cmd); /* * Whoops - the architecture was unable to reboot. -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: thierry.reding@gmail.com (Thierry Reding) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] ARM64: Remove arm_pm_restart() Date: Mon, 30 Jan 2017 12:05:11 +0100 [thread overview] Message-ID: <20170130110512.6943-6-thierry.reding@gmail.com> (raw) In-Reply-To: <20170130110512.6943-1-thierry.reding@gmail.com> From: Guenter Roeck <linux@roeck-us.net> All users of arm_pm_restart() have been converted to use the kernel restart handler. Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> --- arch/arm64/include/asm/system_misc.h | 2 -- arch/arm64/kernel/process.c | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h index bc812435bc76..97398214061f 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -43,8 +43,6 @@ struct mm_struct; extern void show_pte(struct mm_struct *mm, unsigned long addr); extern void __show_regs(struct pt_regs *); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - #define show_unhandled_signals_ratelimited() \ ({ \ static DEFINE_RATELIMIT_STATE(_rs, \ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 0b07d42819da..138918269b3a 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -68,8 +68,6 @@ EXPORT_SYMBOL(__stack_chk_guard); void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); -void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - /* * This is our default idle handler. */ @@ -155,10 +153,7 @@ void machine_restart(char *cmd) efi_reboot(reboot_mode, NULL); /* Now call the architecture specific reboot code. */ - if (arm_pm_restart) - arm_pm_restart(reboot_mode, cmd); - else - do_kernel_restart(cmd); + do_kernel_restart(cmd); /* * Whoops - the architecture was unable to reboot. -- 2.11.0
next prev parent reply other threads:[~2017-01-30 11:05 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-30 11:05 [PATCH 0/6] ARM, arm64: Remove arm_pm_restart() Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 2/6] ARM: xen: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` [PATCH 4/6] ARM: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2017-01-30 11:05 ` Thierry Reding [this message] 2017-01-30 11:05 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding 2017-01-30 11:05 ` [PATCH 6/6] ARM: " Thierry Reding 2017-01-30 11:05 ` Thierry Reding 2019-09-14 15:25 ` [PATCH 0/6] ARM, arm64: " Guenter Roeck 2019-09-14 15:25 ` Guenter Roeck 2019-09-16 7:49 ` Arnd Bergmann 2019-09-16 7:49 ` Arnd Bergmann 2019-09-16 13:17 ` Guenter Roeck 2019-09-16 13:17 ` Guenter Roeck 2019-09-16 13:49 ` Thierry Reding 2019-09-16 13:49 ` Thierry Reding 2019-09-16 15:43 ` Guenter Roeck 2019-09-16 15:43 ` Guenter Roeck 2019-09-16 15:50 ` Thierry Reding 2019-09-16 15:50 ` Thierry Reding 2019-09-16 16:29 ` Arnd Bergmann 2019-09-16 16:29 ` Arnd Bergmann 2019-09-16 20:28 ` Thierry Reding 2019-09-16 20:28 ` Thierry Reding 2019-09-17 0:41 ` Alexandre Belloni 2019-09-17 0:41 ` Alexandre Belloni 2019-09-17 7:01 ` Arnd Bergmann 2019-09-17 7:01 ` Arnd Bergmann 2019-09-17 13:06 ` Guenter Roeck 2019-09-17 13:06 ` Guenter Roeck 2019-10-15 14:51 [PATCH 0/6] ARM/arm64: arm_pm_restart removal Thierry Reding 2019-10-15 14:51 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding 2019-10-15 14:51 ` Thierry Reding
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170130110512.6943-6-thierry.reding@gmail.com \ --to=thierry.reding@gmail.com \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linux@roeck-us.net \ --cc=mark.rutland@arm.com \ --cc=sstabellini@kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.