Re: 2.2.18pre4 won't boot on i686

[Daniel Roesen]

On Sun, Sep 10, 2000 at 08:22:30PM -0400, Horst von Brand wrote:
> hang after "OK, now booting the kernel".

Apply patch attached. Fix by Alan Cox, not me.


Best regards,
Daniel

--- linux-2.2.18pre4.vanilla/init/main.c        Mon Sep 11 02:36:31 2000
+++ linux-2.2.18pre4/init/main.c        Mon Sep 11 02:38:32 2000
@@ -1180,14 +1180,14 @@
 
        /* Now handle new-style __setup parameters */
        p = &__setup_start;
-       do {
+       while (p < &__setup_end) {
                int n = strlen(p->str);
                if (!strncmp(line,p->str,n)) {
                        if (p->setup_func(line+n))
                                return 1;
                }
                p++;
-       } while (p < &__setup_end);
+       }
 
        return 0;
 }
@@ -1493,10 +1493,10 @@
        initcall_t *call;
 
        call = &__initcall_start;
-       do {
+       while (call < &__initcall_end) {
                (*call)();
                call++;
-       } while (call < &__initcall_end);
+       }
 }