aboutsummaryrefslogtreecommitdiff
path: root/init/halt.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/halt.c')
-rw-r--r--init/halt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/init/halt.c b/init/halt.c
index 785c38130..fe3cb9e75 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -65,7 +65,7 @@
65//kbuild:lib-$(CONFIG_REBOOT) += halt.o 65//kbuild:lib-$(CONFIG_REBOOT) += halt.o
66 66
67//usage:#define halt_trivial_usage 67//usage:#define halt_trivial_usage
68//usage: "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") 68//usage: "[-d DELAY] [-nf"IF_FEATURE_WTMP("w")"]"
69//usage:#define halt_full_usage "\n\n" 69//usage:#define halt_full_usage "\n\n"
70//usage: "Halt the system\n" 70//usage: "Halt the system\n"
71//usage: "\n -d SEC Delay interval" 71//usage: "\n -d SEC Delay interval"
@@ -76,7 +76,7 @@
76//usage: ) 76//usage: )
77//usage: 77//usage:
78//usage:#define poweroff_trivial_usage 78//usage:#define poweroff_trivial_usage
79//usage: "[-d DELAY] [-n] [-f]" 79//usage: "[-d DELAY] [-nf]"
80//usage:#define poweroff_full_usage "\n\n" 80//usage:#define poweroff_full_usage "\n\n"
81//usage: "Halt and shut off power\n" 81//usage: "Halt and shut off power\n"
82//usage: "\n -d SEC Delay interval" 82//usage: "\n -d SEC Delay interval"
@@ -84,7 +84,7 @@
84//usage: "\n -f Force (don't go through init)" 84//usage: "\n -f Force (don't go through init)"
85//usage: 85//usage:
86//usage:#define reboot_trivial_usage 86//usage:#define reboot_trivial_usage
87//usage: "[-d DELAY] [-n] [-f]" 87//usage: "[-d DELAY] [-nf]"
88//usage:#define reboot_full_usage "\n\n" 88//usage:#define reboot_full_usage "\n\n"
89//usage: "Reboot the system\n" 89//usage: "Reboot the system\n"
90//usage: "\n -d SEC Delay interval" 90//usage: "\n -d SEC Delay interval"
@@ -144,14 +144,14 @@ static int init_was_not_there(void)
144 */ 144 */
145#if 0 145#if 0
146 while (kill(1, 0) != 0 && --cnt >= 0) 146 while (kill(1, 0) != 0 && --cnt >= 0)
147 sleep(1); 147 sleep1();
148#endif 148#endif
149 /* ... so let's wait for some evidence a usual startup event, 149 /* ... so let's wait for some evidence a usual startup event,
150 * mounting of /proc, happened. By that time init should be ready 150 * mounting of /proc, happened. By that time init should be ready
151 * for signals. 151 * for signals.
152 */ 152 */
153 while (access("/proc/meminfo", F_OK) != 0 && --cnt >= 0) 153 while (access("/proc/meminfo", F_OK) != 0 && --cnt >= 0)
154 sleep(1); 154 sleep1();
155 155
156 /* Does it look like init wasn't there? */ 156 /* Does it look like init wasn't there? */
157 return (cnt != initial - 1); 157 return (cnt != initial - 1);