From: Thierry Reding <thierry.reding@gmail.com> To: Russell King <linux@armlinux.org.uk>, arm@kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Guenter Roeck <linux@roeck-us.net>, Stefan Agner <stefan@agner.ch>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Catalin Marinas <catalin.marinas@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] ARM64: Remove arm_pm_restart() Date: Tue, 15 Oct 2019 16:51:46 +0200 [thread overview] Message-ID: <20191015145147.1106247-6-thierry.reding@gmail.com> (raw) In-Reply-To: <20191015145147.1106247-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 1ab63cfbbaf1..d02c5e5ea015 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -32,8 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct mm_struct; extern void __show_regs(struct pt_regs *); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - #endif /* __ASSEMBLY__ */ #endif /* __ASM_SYSTEM_MISC_H */ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index a47462def04b..f11d2b261b4e 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -64,8 +64,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); - static void __cpu_do_idle(void) { dsb(sy); @@ -195,10 +193,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.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <thierry.reding@gmail.com> To: Russell King <linux@armlinux.org.uk>, arm@kernel.org Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Arnd Bergmann <arnd@arndb.de>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Catalin Marinas <catalin.marinas@arm.com>, linux-kernel@vger.kernel.org, Stefan Agner <stefan@agner.ch>, Wolfram Sang <wsa+renesas@sang-engineering.com>, linux-arm-kernel@lists.infradead.org, Olof Johansson <olof@lixom.net>, Guenter Roeck <linux@roeck-us.net> Subject: [PATCH 5/6] ARM64: Remove arm_pm_restart() Date: Tue, 15 Oct 2019 16:51:46 +0200 [thread overview] Message-ID: <20191015145147.1106247-6-thierry.reding@gmail.com> (raw) In-Reply-To: <20191015145147.1106247-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 1ab63cfbbaf1..d02c5e5ea015 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -32,8 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct mm_struct; extern void __show_regs(struct pt_regs *); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - #endif /* __ASSEMBLY__ */ #endif /* __ASM_SYSTEM_MISC_H */ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index a47462def04b..f11d2b261b4e 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -64,8 +64,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); - static void __cpu_do_idle(void) { dsb(sy); @@ -195,10 +193,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.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-15 14:52 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-15 14:51 [PATCH 0/6] ARM/arm64: arm_pm_restart removal Thierry Reding 2019-10-15 14:51 ` Thierry Reding 2019-10-15 14:51 ` [PATCH 1/6] ARM: prima2: Register with kernel restart handler Thierry Reding 2019-10-15 14:51 ` Thierry Reding 2019-10-15 14:51 ` [PATCH 2/6] ARM: xen: " Thierry Reding 2019-10-15 14:51 ` Thierry Reding [not found] ` <CAF2Aj3hbW7+pNp+_jnMVL8zeSxAvSbV1ZFZ_4PAUj6J0TxMk7g@mail.gmail.com> 2021-06-03 13:11 ` Guenter Roeck 2021-06-03 13:11 ` Guenter Roeck 2021-06-03 13:38 ` Lee Jones 2021-06-03 13:38 ` Lee Jones 2021-06-03 13:48 ` Boris Ostrovsky 2021-06-03 13:48 ` Boris Ostrovsky 2021-06-03 13:56 ` Russell King (Oracle) 2021-06-03 13:56 ` Russell King (Oracle) 2021-06-03 14:03 ` Lee Jones 2021-06-03 14:03 ` Lee Jones 2021-06-03 14:10 ` Russell King (Oracle) 2021-06-03 14:10 ` Russell King (Oracle) 2021-06-03 14:20 ` Thierry Reding 2021-06-03 14:20 ` Thierry Reding 2021-06-03 13:45 ` Russell King (Oracle) 2021-06-03 13:45 ` Russell King (Oracle) 2019-10-15 14:51 ` [PATCH 3/6] drivers: firmware: psci: " Thierry Reding 2019-10-15 14:51 ` Thierry Reding 2019-10-16 7:46 ` Stefan Agner 2019-10-16 7:46 ` Stefan Agner 2019-10-15 14:51 ` [PATCH 4/6] ARM: " Thierry Reding 2019-10-15 14:51 ` Thierry Reding 2019-10-15 14:51 ` Thierry Reding [this message] 2019-10-15 14:51 ` [PATCH 5/6] ARM64: Remove arm_pm_restart() Thierry Reding 2019-10-15 14:51 ` [PATCH 6/6] ARM: " Thierry Reding 2019-10-15 14:51 ` Thierry Reding -- strict thread matches above, loose matches on Subject: below -- 2017-01-30 11:05 [PATCH 0/6] ARM, arm64: " Thierry Reding 2017-01-30 11:05 ` [PATCH 5/6] ARM64: " Thierry Reding 2017-01-30 11:05 ` 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=20191015145147.1106247-6-thierry.reding@gmail.com \ --to=thierry.reding@gmail.com \ --cc=arm@kernel.org \ --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=lorenzo.pieralisi@arm.com \ --cc=olof@lixom.net \ --cc=stefan@agner.ch \ --cc=stefano.stabellini@eu.citrix.com \ --cc=wsa+renesas@sang-engineering.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.