projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[linux-2.6-microblaze.git]
/
kernel
/
reboot.c
diff --git
a/kernel/reboot.c
b/kernel/reboot.c
index
c4d472b
..
491f134
100644
(file)
--- a/
kernel/reboot.c
+++ b/
kernel/reboot.c
@@
-250,7
+250,7
@@
void kernel_restart(char *cmd)
pr_emerg("Restarting system\n");
else
pr_emerg("Restarting system with command '%s'\n", cmd);
pr_emerg("Restarting system\n");
else
pr_emerg("Restarting system with command '%s'\n", cmd);
- kmsg_dump(KMSG_DUMP_
RESTART
);
+ kmsg_dump(KMSG_DUMP_
SHUTDOWN
);
machine_restart(cmd);
}
EXPORT_SYMBOL_GPL(kernel_restart);
machine_restart(cmd);
}
EXPORT_SYMBOL_GPL(kernel_restart);
@@
-274,7
+274,7
@@
void kernel_halt(void)
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("System halted\n");
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("System halted\n");
- kmsg_dump(KMSG_DUMP_
HALT
);
+ kmsg_dump(KMSG_DUMP_
SHUTDOWN
);
machine_halt();
}
EXPORT_SYMBOL_GPL(kernel_halt);
machine_halt();
}
EXPORT_SYMBOL_GPL(kernel_halt);
@@
-292,7
+292,7
@@
void kernel_power_off(void)
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("Power down\n");
migrate_to_reboot_cpu();
syscore_shutdown();
pr_emerg("Power down\n");
- kmsg_dump(KMSG_DUMP_
POWEROFF
);
+ kmsg_dump(KMSG_DUMP_
SHUTDOWN
);
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);
machine_power_off();
}
EXPORT_SYMBOL_GPL(kernel_power_off);