projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ps3
/
sys-manager-core.c
diff --git
a/drivers/ps3/sys-manager-core.c
b/drivers/ps3/sys-manager-core.c
index 0e41737ea835a66d862f3b3f490be9f52dca68a1..c429ffca1ab7633b475e2b767986284c4f651b7e 100644
(file)
--- a/
drivers/ps3/sys-manager-core.c
+++ b/
drivers/ps3/sys-manager-core.c
@@
-47,7
+47,7
@@
void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops)
}
EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops);
}
EXPORT_SYMBOL_GPL(ps3_sys_manager_register_ops);
-void ps3_sys_manager_power_off(void)
+void
__noreturn
ps3_sys_manager_power_off(void)
{
if (ps3_sys_manager_ops.power_off)
ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
{
if (ps3_sys_manager_ops.power_off)
ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
@@
-55,7
+55,7
@@
void ps3_sys_manager_power_off(void)
ps3_sys_manager_halt();
}
ps3_sys_manager_halt();
}
-void ps3_sys_manager_restart(void)
+void
__noreturn
ps3_sys_manager_restart(void)
{
if (ps3_sys_manager_ops.restart)
ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
{
if (ps3_sys_manager_ops.restart)
ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
@@
-63,7
+63,7
@@
void ps3_sys_manager_restart(void)
ps3_sys_manager_halt();
}
ps3_sys_manager_halt();
}
-void ps3_sys_manager_halt(void)
+void
__noreturn
ps3_sys_manager_halt(void)
{
pr_emerg("System Halted, OK to turn off power\n");
local_irq_disable();
{
pr_emerg("System Halted, OK to turn off power\n");
local_irq_disable();