If find_pid_by_name() had an error, it was returning -1, but storing

that into a pid_t, which is unsigned on a number archs.  Furthermore,
find_pid_by_name() would _never_ return an error if the intended proces
was "init", but instead would return 1, meaning we would fail to work
on 2.4.x kernels running an initrd...
 -Erik

3 files changed, 3 insertions, 3 deletions

diff --git a/init/halt.c b/init/halt.c
index 307c1022d..917de8b5a 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -28,7 +28,7 @@ extern int halt_main(int argc, char **argv)
 {
 #ifdef CONFIG_FEATURE_INITRD
         /* don't assume init's pid == 1 */
-        pid_t *pid = find_pid_by_name("init");
+        long *pid = find_pid_by_name("init");
         if (!pid || *pid<=0) {
                 pid = find_pid_by_name("linuxrc");
                 if (!pid || *pid<=0)
diff --git a/init/poweroff.c b/init/poweroff.c
index cec2d6ddd..d99b5562d 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -28,7 +28,7 @@ extern int poweroff_main(int argc, char **argv)
 {
 #ifdef CONFIG_FEATURE_INITRD
         /* don't assume init's pid == 1 */
-        pid_t *pid = find_pid_by_name("init");
+        long *pid = find_pid_by_name("init");
         if (!pid || *pid<=0) {
                 pid = find_pid_by_name("linuxrc");
                 if (!pid || *pid<=0)
diff --git a/init/reboot.c b/init/reboot.c
index a13d42492..6f71536d8 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -28,7 +28,7 @@ extern int reboot_main(int argc, char **argv)
 {
 #ifdef CONFIG_FEATURE_INITRD
         /* don't assume init's pid == 1 */
-        pid_t *pid = find_pid_by_name("init");
+        long *pid = find_pid_by_name("init");
         if (!pid || *pid<=0) {
                 pid = find_pid_by_name("linuxrc");
                 if (!pid || *pid<=0)