sleep before boot panic

sleep before boot panic

[Bernd Schubert]

Hi,

I just switched to libata (pata) on my laptop and the immediate panic made it 
impossible to figure out why my boot partition wasn't available.
After applying this little patch I could check boot printk output and then saw 
everything was properly recognized and only scsi-disk support was missing.


Signed-off-by: Bernd Schubert <bernd-schubert@gmx.de>

Index: zd1211rw.git.beno/init/do_mounts.c
===================================================================
--- zd1211rw.git.beno.orig/init/do_mounts.c	2008-01-06 18:44:23.000000000 
+0100
+++ zd1211rw.git.beno/init/do_mounts.c	2008-01-06 18:45:44.000000000 +0100
@@ -330,6 +330,7 @@
 		printk("Please append a correct \"root=\" boot option; here are the 
available partitions:\n");
 
 		printk_all_partitions();
+		msleep(60 * 1000);
 		panic("VFS: Unable to mount root fs on %s", b);
 	}
 


Cheers,
Bernd

Re: sleep before boot panic

[Ingo Oeser]

Hi Bernd,

On Sunday 06 January 2008, you wrote:
> Index: zd1211rw.git.beno/init/do_mounts.c
> ===================================================================
> --- zd1211rw.git.beno.orig/init/do_mounts.c	2008-01-06 18:44:23.000000000 
> +0100
> +++ zd1211rw.git.beno/init/do_mounts.c	2008-01-06 18:45:44.000000000 +0100
> @@ -330,6 +330,7 @@
>  		printk("Please append a correct \"root=\" boot option; here are the 
> available partitions:\n");
>  
>  		printk_all_partitions();
> +		msleep(60 * 1000);

ssleep(60);

>  		panic("VFS: Unable to mount root fs on %s", b);
>  	}

Better would be for this and similiar panic()s
(fatal user/admin errors on boot) to NOT print a stack trace+registers,
since it is useless and actually hides useful information.


Best Regards

Ingo Oeser

Re: sleep before boot panic

[Bernd Schubert]

Hello Ingo,

On Sunday 06 January 2008, Ingo Oeser wrote:
> Hi Bernd,
>
> On Sunday 06 January 2008, you wrote:
> > Index: zd1211rw.git.beno/init/do_mounts.c
> > ===================================================================
> > --- zd1211rw.git.beno.orig/init/do_mounts.c	2008-01-06 18:44:23.000000000
> > +0100
> > +++ zd1211rw.git.beno/init/do_mounts.c	2008-01-06 18:45:44.000000000
> > +0100 @@ -330,6 +330,7 @@
> >  		printk("Please append a correct \"root=\" boot option; here are the
> > available partitions:\n");
> >
> >  		printk_all_partitions();
> > +		msleep(60 * 1000);
>
> ssleep(60);

feel free to replace it replace it :)

>
> >  		panic("VFS: Unable to mount root fs on %s", b);
> >  	}
>
> Better would be for this and similiar panic()s
> (fatal user/admin errors on boot) to NOT print a stack trace+registers,
> since it is useless and actually hides useful information.

There is no dump_stack() here, but disc detection is relatively early in boot 
process and on all these information are already scrolled off screen when the 
panic is done. For this and any other panic it would be optimal if scrolling 
still would work, but scrolling also requires kernel code, so I see there's a 
reason not to this for all panics. However, for this boot problem I tend to 
say there's no need to panic at all...

Btw, not all stack straces are useless, *most* of them are actually very 
useful.

Cheers,
Bernd

Re: sleep before boot panic

[Ingo Oeser]

Hi Bernd,

CC'ed hpa, since I'm sure he can give useful advise on that :-)

On Sunday 06 January 2008, Bernd Schubert wrote:
> On Sunday 06 January 2008, Ingo Oeser wrote:
> > Hi Bernd,
> >
> > On Sunday 06 January 2008, you wrote:
> > > Index: zd1211rw.git.beno/init/do_mounts.c
> > > ===================================================================
> > > --- zd1211rw.git.beno.orig/init/do_mounts.c	2008-01-06 18:44:23.000000000
> > > +0100
> > > +++ zd1211rw.git.beno/init/do_mounts.c	2008-01-06 18:45:44.000000000
> > > +0100 @@ -330,6 +330,7 @@
> > >  		printk("Please append a correct \"root=\" boot option; here are the
> > > available partitions:\n");
> > >
> > >  		printk_all_partitions();
> > > +		msleep(60 * 1000);
> >
> > ssleep(60);
> 
> feel free to replace it replace it :)

Not that urgent, but if you resubmit please do it :-)

> There is no dump_stack() here, but disc detection is relatively early in boot 
> process and on all these information are already scrolled off screen when the 
> panic is done. For this and any other panic it would be optimal if scrolling 
> still would work, but scrolling also requires kernel code, so I see there's a 
> reason not to this for all panics. However, for this boot problem I tend to 
> say there's no need to panic at all...

But the kernel cannot continue from that position. You would need a "soft" panic,
which allows behavior of panic=X, but let the kernel continue.

Even better is to continue with the init in the builtin ramfs. That should always
be available and can implement any behavior desired (like droping into a dash).

> Btw, not all stack straces are useless, *most* of them are actually very 
> useful.

I didn't say that. Just if you cannot continue due to admin error, 
but the kernel is in a perfect valid state otherwise,
dumping stack is next to useless.


Best Regards

Ingo Oeser

Re: sleep before boot panic

[Andi Kleen]

Bernd Schubert <bernd-schubert@gmx.de> writes:

> Hi,
>
> I just switched to libata (pata) on my laptop and the immediate panic made it 
> impossible to figure out why my boot partition wasn't available.
> After applying this little patch I could check boot printk output and then saw 
> everything was properly recognized and only scsi-disk support was missing.

The correct fix would be to make scroll back (and sysrq) still work
after panic.  It's a little more complicated, but possible (essentially
it needs a polled keyboard handler)

-Andi

Re: sleep before boot panic

[Ingo Oeser]

On Monday 07 January 2008, Andi Kleen wrote:
> Bernd Schubert <bernd-schubert@gmx.de> writes:
> 
> > Hi,
> >
> > I just switched to libata (pata) on my laptop and the immediate panic made it 
> > impossible to figure out why my boot partition wasn't available.
> > After applying this little patch I could check boot printk output and then saw 
> > everything was properly recognized and only scsi-disk support was missing.
> 
> The correct fix would be to make scroll back (and sysrq) still work
> after panic.  It's a little more complicated, but possible (essentially
> it needs a polled keyboard handler)

Customer: "This system could not find the root fs."
Support: "Oh, yeah, just connect a (USB-) keyboard and scroll back."

Hmm, device detection works after panic?

I really like the "soft" panic better, where you still can operate the 
kernel debugging features, but just have no user space supporting it.

One better hopes, that keyboards never need external firmware to be loaded
at this stage :-)

Best Regards

Ingo Oeser, who just hit the same problem yesterday...

Re: sleep before boot panic

[H. Peter Anvin]

Ingo Oeser wrote:
> On Monday 07 January 2008, Andi Kleen wrote:
>> Bernd Schubert <bernd-schubert@gmx.de> writes:
>>
>>> Hi,
>>>
>>> I just switched to libata (pata) on my laptop and the immediate panic made it 
>>> impossible to figure out why my boot partition wasn't available.
>>> After applying this little patch I could check boot printk output and then saw 
>>> everything was properly recognized and only scsi-disk support was missing.
>> The correct fix would be to make scroll back (and sysrq) still work
>> after panic.  It's a little more complicated, but possible (essentially
>> it needs a polled keyboard handler)
> 
> Customer: "This system could not find the root fs."
> Support: "Oh, yeah, just connect a (USB-) keyboard and scroll back."
> 
> Hmm, device detection works after panic?
> 
> I really like the "soft" panic better, where you still can operate the 
> kernel debugging features, but just have no user space supporting it.
> 

Of course, if we'd been using kinit, "soft panic" would have been done 
exclusively in userspace...

	-hpa

Re: sleep before boot panic

[Pavel Machek]

Hi!

> >>>I just switched to libata (pata) on my laptop and the 
> >>>immediate panic made it impossible to figure out why 
> >>>my boot partition wasn't available.
> >>>After applying this little patch I could check boot 
> >>>printk output and then saw everything was properly 
> >>>recognized and only scsi-disk support was missing.
> >>The correct fix would be to make scroll back (and 
> >>sysrq) still work
> >>after panic.  It's a little more complicated, but 
> >>possible (essentially
> >>it needs a polled keyboard handler)
> >
> >Customer: "This system could not find the root fs."
> >Support: "Oh, yeah, just connect a (USB-) keyboard and 
> >scroll back."
> >
> >Hmm, device detection works after panic?
> >
> >I really like the "soft" panic better, where you still 
> >can operate the kernel debugging features, but just 
> >have no user space supporting it.

ACK. 'scheduling in interrupt' is very different from 'cant mount
root'.

> Of course, if we'd been using kinit, "soft panic" would 
> have been done exclusively in userspace...

What's the status of kinit, btw?
							Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: sleep before boot panic

[Andi Kleen]

> I really like the "soft" panic better, where you still can operate the 
> kernel debugging features, but just have no user space supporting it.

There is no specific reason many kernel debugging features (sysrq, scrollback) 
cannot work in the hard panic -- except that nobody coded it yet.

-Andi

Re: sleep before boot panic

[H. Peter Anvin]

Pavel Machek wrote:
> 
>> Of course, if we'd been using kinit, "soft panic" would 
>> have been done exclusively in userspace...
> 
> What's the status of kinit, btw?
> 							Pavel

It's bitrotted a bit since it was first rejected.  It wouldn't take too 
much work to bring it back up to speed, however.  klibc, and some of the 
kinit components, are used for the initramfs in Debian.

	-hpa

kinit (was: sleep before boot panic)

[Ingo Oeser]

On Wednesday 09 January 2008, H. Peter Anvin wrote:
> Pavel Machek wrote:
> > 
> >> Of course, if we'd been using kinit, "soft panic" would 
> >> have been done exclusively in userspace...
> > 
> > What's the status of kinit, btw?
> > 							Pavel
> 
> It's bitrotted a bit since it was first rejected.  It wouldn't take too 
> much work to bring it back up to speed, however.  klibc, and some of the 
> kinit components, are used for the initramfs in Debian.

Yes, and I like most of it. The only thing really missing for me 
is LVM support. Debian (?) did a evil hack to make it work.
Maybe one day this itches soo much, I'll even scratch it :-)

Then I'll be able to test kernels on a standard LVM installation again.

So please keep up the good work!


Best Regards

Ingo Oeser

Re: sleep before boot panic

[Andrew Morton]

On Sun, 6 Jan 2008 19:08:42 +0100 Bernd Schubert <bernd-schubert@gmx.de> wrote:

> Hi,
> 
> I just switched to libata (pata) on my laptop and the immediate panic made it 
> impossible to figure out why my boot partition wasn't available.
> After applying this little patch I could check boot printk output and then saw 
> everything was properly recognized and only scsi-disk support was missing.
> 
> 
> Signed-off-by: Bernd Schubert <bernd-schubert@gmx.de>
> 
> Index: zd1211rw.git.beno/init/do_mounts.c
> ===================================================================
> --- zd1211rw.git.beno.orig/init/do_mounts.c	2008-01-06 18:44:23.000000000 
> +0100

Your email client is wordwrapping things.

> +++ zd1211rw.git.beno/init/do_mounts.c	2008-01-06 18:45:44.000000000 +0100
> @@ -330,6 +330,7 @@
>  		printk("Please append a correct \"root=\" boot option; here are the 
> available partitions:\n");
>  
>  		printk_all_partitions();
> +		msleep(60 * 1000);
>  		panic("VFS: Unable to mount root fs on %s", b);
>  	}

We could borrow the existing pause_on_oops stuff and use it in panic().

Or we could copy it into a new pause_on_panic, but it's hard to see a use
case where they need to be separate.

Re: sleep before boot panic

[Bodo Eggert]

On Mon, 7 Jan 2008, Pavel Machek wrote:

> > Introduce config CONFIG_SOFTPANIC
> > Enabling this option changes a hard panic on boot errors to a
> > soft panic, which does not stop the system completely.
> > You can still scroll the screen and read the messages.
> > 
> > Signed-Off-By: Bodo Eggert <7eggert@gmx.de>
> 
> Looks good to me... but should this be configurable? IMO we should
> just do the right thing.

Having it configurable doesn't cost much, and the embedded folks without a 
screen certainly don't need this code.
-- 
Funny quotes:
23. If at first you don't succeed, destroy all evidence that you tried.

Re: sleep before boot panic

[Pavel Machek]

Hi!

> Introduce config CONFIG_SOFTPANIC
> Enabling this option changes a hard panic on boot errors to a
> soft panic, which does not stop the system completely.
> You can still scroll the screen and read the messages.
> 
> Signed-Off-By: Bodo Eggert <7eggert@gmx.de>

Looks good to me... but should this be configurable? IMO we should
just do the right thing.
							Pavel

> diff -pruN linux-2.6.23.base/include/linux/kernel.h
> linux-2.6.23.softpanic/include/linux/kernel.h
> --- linux-2.6.23.base/include/linux/kernel.h    2007-10-11 14:15:39.000000000 +0200
> +++ linux-2.6.23.softpanic/include/linux/kernel.h       2007-10-11 14:45:15.000000000
> +0200
> @@ -108,6 +108,12 @@ extern struct atomic_notifier_head panic
>  extern long (*panic_blink)(long time);
>  NORET_TYPE void panic(const char * fmt, ...)
>         __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
> +#ifdef SOFTPANIC
> +NORET_TYPE void softpanic(const char * fmt, ...)
> +       __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
> +#else
> +# define softpanic(...) do { panic(__VA_ARGS__); } while (0)
> +#endif
>  extern void oops_enter(void);
>  extern void oops_exit(void);
>  extern int oops_may_print(void);
> diff -pruN linux-2.6.23.base/init/Kconfig linux-2.6.23.softpanic/init/Kconfig
> --- linux-2.6.23.base/init/Kconfig      2007-10-11 14:15:42.000000000 +0200
> +++ linux-2.6.23.softpanic/init/Kconfig 2007-10-11 15:19:07.000000000 +0200
> @@ -441,6 +441,14 @@ config BUG
>            option for embedded systems with no facilities for reporting errors.
>            Just say Y.
>  
> +config SOFTPANIC
> +       bool "Enable softpanic for boot errors" if EMBEDDED
> +       default y
> +       help
> +               Enabling this option changes a hard panic on boot errors to a
> +               soft panic, which does not stop the system completely.
> +               You can still scroll the screen and read the messages.
> +
>  config ELF_CORE
>         default y
>         bool "Enable ELF core dumps" if EMBEDDED
> diff -pruN linux-2.6.23.base/init/do_mounts.c
> linux-2.6.23.softpanic/init/do_mounts.c
> --- linux-2.6.23.base/init/do_mounts.c  2007-10-11 14:15:42.000000000 +0200
> +++ linux-2.6.23.softpanic/init/do_mounts.c     2007-10-11 14:48:51.000000000 +0200
> @@ -330,7 +330,7 @@ retry:
>                 printk("Please append a correct \"root=\" boot option; here are the available
> partitions:\n");
>  
>                 printk_all_partitions();
> -               panic("VFS: Unable to mount root fs on %s", b);
> +               softpanic("VFS: Unable to mount root fs on %s", b);
>         }
>  
>         printk("List of all partitions:\n");
> @@ -342,7 +342,7 @@ retry:
>  #ifdef CONFIG_BLOCK
>         __bdevname(ROOT_DEV, b);
>  #endif
> -       panic("VFS: Unable to mount root fs on %s", b);
> +       softpanic("VFS: Unable to mount root fs on %s", b);
>  out:
>         putname(fs_names);
>  }
> diff -pruN linux-2.6.23.base/init/main.c linux-2.6.23.softpanic/init/main.c
> --- linux-2.6.23.base/init/main.c       2007-10-11 14:15:42.000000000 +0200
> +++ linux-2.6.23.softpanic/init/main.c  2007-10-11 14:40:06.000000000 +0200
> @@ -590,7 +590,7 @@ asmlinkage void __init start_kernel(void
>          */
>         console_init();
>         if (panic_later)
> -               panic(panic_later, panic_param);
> +               softpanic(panic_later, panic_param);
>  
>         lockdep_info();
>  
> @@ -807,7 +807,7 @@ static int noinline init_post(void)
>         run_init_process("/bin/init");
>         run_init_process("/bin/sh");
>  
> -       panic("No init found.  Try passing init= option to kernel.");
> +       softpanic("No init found.  Try passing init= option to kernel.");
>  }
>  
>  static int __init kernel_init(void * unused)
> diff -pruN linux-2.6.23.base/kernel/panic.c
> linux-2.6.23.softpanic/kernel/panic.c
> --- linux-2.6.23.base/kernel/panic.c    2007-10-11 14:15:42.000000000 +0200
> +++ linux-2.6.23.softpanic/kernel/panic.c       2007-10-11 14:53:42.000000000 +0200
> @@ -139,7 +139,66 @@ NORET_TYPE void panic(const char * fmt, 
>         }
>  }
>  
> +#ifdef SOFTPANIC
> +NORET_TYPE void softpanic(const char * fmt, ...)
> +{
> +       long i;
> +       static char buf[1024];
> +       va_list args;
> +#if defined(CONFIG_S390)
> +        unsigned long caller = (unsigned long) __builtin_return_address(0);
> +#endif
> +
> +       va_start(args, fmt);
> +       vsnprintf(buf, sizeof(buf), fmt, args);
> +       va_end(args);
> +       printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
> +
> +       atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
> +
> +       if (!panic_blink)
> +               panic_blink = no_blink;
> +
> +       if (panic_timeout > 0) {
> +               /*
> +                * Delay timeout seconds before rebooting the machine. 
> +                * We can't use the "normal" timers since we just panicked..
> +                */
> +               printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
> +               for (i = 0; i < panic_timeout*1000; ) {
> +                       touch_nmi_watchdog();
> +                       i += panic_blink(i);
> +                       mdelay(1);
> +                       i++;
> +               }
> +               /*      This will not be a clean reboot, with everything
> +                *      shutting down.  But if there is a chance of
> +                *      rebooting the system it will be rebooted.
> +                */
> +               kernel_restart(NULL);
> +       }
> +#ifdef __sparc__
> +       {
> +               extern int stop_a_enabled;
> +               /* Make sure the user can actually press Stop-A (L1-A) */
> +               stop_a_enabled = 1;
> +               printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n");
> +       }
> +#endif
> +#if defined(CONFIG_S390)
> +        disabled_wait(caller);
> +#endif
> +       for (i = 0;;) {
> +               touch_softlockup_watchdog();
> +               i += panic_blink(i);
> +               msleep(1);
> +               i++;
> +       }
> +}
> +#endif
> +
>  EXPORT_SYMBOL(panic);
> +EXPORT_SYMBOL(softpanic);
>  
>  /**
>   *     print_tainted - return a string to represent the kernel taint state.
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: sleep before boot panic

[Bodo Eggert]

Ingo Oeser <ioe-lkml@rameria.de> wrote:

> CC'ed hpa, since I'm sure he can give useful advise on that :-)
> 
> On Sunday 06 January 2008, Bernd Schubert wrote:
>> On Sunday 06 January 2008, Ingo Oeser wrote:
>> > On Sunday 06 January 2008, you wrote:

>> > > Index: zd1211rw.git.beno/init/do_mounts.c
>> > > ===================================================================
>> > > --- zd1211rw.git.beno.orig/init/do_mounts.c      2008-01-06 18:44:23.000000000
>> > > +0100
>> > > +++ zd1211rw.git.beno/init/do_mounts.c   2008-01-06 18:45:44.000000000
>> > > +0100 @@ -330,6 +330,7 @@
>> > >  printk("Please append a correct \"root=\" boot option; here are the
>> > > available partitions:\n");
>> > >
>> > >  printk_all_partitions();
>> > > +                msleep(60 * 1000);
>> >
>> > ssleep(60);
>> 
>> feel free to replace it replace it :)
> 
> Not that urgent, but if you resubmit please do it :-)

You don't need to, because ...

>> There is no dump_stack() here, but disc detection is relatively early in boot
>> process and on all these information are already scrolled off screen when the
>> panic is done. For this and any other panic it would be optimal if scrolling
>> still would work, but scrolling also requires kernel code, so I see there's a
>> reason not to this for all panics. However, for this boot problem I tend to
>> say there's no need to panic at all...
> 
> But the kernel cannot continue from that position. You would need a "soft"
> panic, which allows behavior of panic=X, but let the kernel continue.

Ingo is right, and I've done the work. The latest version is included below.
If it does not apply cleanly and there is a chance of including it, I'll
port the patch to any version you name.

> Even better is to continue with the init in the builtin ramfs. That should
> always be available and can implement any behavior desired (like droping into
> a dash).

ACK, but that's your part.


<snip>

Introduce config CONFIG_SOFTPANIC
Enabling this option changes a hard panic on boot errors to a
soft panic, which does not stop the system completely.
You can still scroll the screen and read the messages.

Signed-Off-By: Bodo Eggert <7eggert@gmx.de>

diff -pruN linux-2.6.23.base/include/linux/kernel.h
linux-2.6.23.softpanic/include/linux/kernel.h
--- linux-2.6.23.base/include/linux/kernel.h    2007-10-11 14:15:39.000000000 +0200
+++ linux-2.6.23.softpanic/include/linux/kernel.h       2007-10-11 14:45:15.000000000
+0200
@@ -108,6 +108,12 @@ extern struct atomic_notifier_head panic
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
        __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
+#ifdef SOFTPANIC
+NORET_TYPE void softpanic(const char * fmt, ...)
+       __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
+#else
+# define softpanic(...) do { panic(__VA_ARGS__); } while (0)
+#endif
 extern void oops_enter(void);
 extern void oops_exit(void);
 extern int oops_may_print(void);
diff -pruN linux-2.6.23.base/init/Kconfig linux-2.6.23.softpanic/init/Kconfig
--- linux-2.6.23.base/init/Kconfig      2007-10-11 14:15:42.000000000 +0200
+++ linux-2.6.23.softpanic/init/Kconfig 2007-10-11 15:19:07.000000000 +0200
@@ -441,6 +441,14 @@ config BUG
           option for embedded systems with no facilities for reporting errors.
           Just say Y.
 
+config SOFTPANIC
+       bool "Enable softpanic for boot errors" if EMBEDDED
+       default y
+       help
+               Enabling this option changes a hard panic on boot errors to a
+               soft panic, which does not stop the system completely.
+               You can still scroll the screen and read the messages.
+
 config ELF_CORE
        default y
        bool "Enable ELF core dumps" if EMBEDDED
diff -pruN linux-2.6.23.base/init/do_mounts.c
linux-2.6.23.softpanic/init/do_mounts.c
--- linux-2.6.23.base/init/do_mounts.c  2007-10-11 14:15:42.000000000 +0200
+++ linux-2.6.23.softpanic/init/do_mounts.c     2007-10-11 14:48:51.000000000 +0200
@@ -330,7 +330,7 @@ retry:
                printk("Please append a correct \"root=\" boot option; here are the available
partitions:\n");
 
                printk_all_partitions();
-               panic("VFS: Unable to mount root fs on %s", b);
+               softpanic("VFS: Unable to mount root fs on %s", b);
        }
 
        printk("List of all partitions:\n");
@@ -342,7 +342,7 @@ retry:
 #ifdef CONFIG_BLOCK
        __bdevname(ROOT_DEV, b);
 #endif
-       panic("VFS: Unable to mount root fs on %s", b);
+       softpanic("VFS: Unable to mount root fs on %s", b);
 out:
        putname(fs_names);
 }
diff -pruN linux-2.6.23.base/init/main.c linux-2.6.23.softpanic/init/main.c
--- linux-2.6.23.base/init/main.c       2007-10-11 14:15:42.000000000 +0200
+++ linux-2.6.23.softpanic/init/main.c  2007-10-11 14:40:06.000000000 +0200
@@ -590,7 +590,7 @@ asmlinkage void __init start_kernel(void
         */
        console_init();
        if (panic_later)
-               panic(panic_later, panic_param);
+               softpanic(panic_later, panic_param);
 
        lockdep_info();
 
@@ -807,7 +807,7 @@ static int noinline init_post(void)
        run_init_process("/bin/init");
        run_init_process("/bin/sh");
 
-       panic("No init found.  Try passing init= option to kernel.");
+       softpanic("No init found.  Try passing init= option to kernel.");
 }
 
 static int __init kernel_init(void * unused)
diff -pruN linux-2.6.23.base/kernel/panic.c
linux-2.6.23.softpanic/kernel/panic.c
--- linux-2.6.23.base/kernel/panic.c    2007-10-11 14:15:42.000000000 +0200
+++ linux-2.6.23.softpanic/kernel/panic.c       2007-10-11 14:53:42.000000000 +0200
@@ -139,7 +139,66 @@ NORET_TYPE void panic(const char * fmt, 
        }
 }
 
+#ifdef SOFTPANIC
+NORET_TYPE void softpanic(const char * fmt, ...)
+{
+       long i;
+       static char buf[1024];
+       va_list args;
+#if defined(CONFIG_S390)
+        unsigned long caller = (unsigned long) __builtin_return_address(0);
+#endif
+
+       va_start(args, fmt);
+       vsnprintf(buf, sizeof(buf), fmt, args);
+       va_end(args);
+       printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
+
+       atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
+
+       if (!panic_blink)
+               panic_blink = no_blink;
+
+       if (panic_timeout > 0) {
+               /*
+                * Delay timeout seconds before rebooting the machine. 
+                * We can't use the "normal" timers since we just panicked..
+                */
+               printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
+               for (i = 0; i < panic_timeout*1000; ) {
+                       touch_nmi_watchdog();
+                       i += panic_blink(i);
+                       mdelay(1);
+                       i++;
+               }
+               /*      This will not be a clean reboot, with everything
+                *      shutting down.  But if there is a chance of
+                *      rebooting the system it will be rebooted.
+                */
+               kernel_restart(NULL);
+       }
+#ifdef __sparc__
+       {
+               extern int stop_a_enabled;
+               /* Make sure the user can actually press Stop-A (L1-A) */
+               stop_a_enabled = 1;
+               printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n");
+       }
+#endif
+#if defined(CONFIG_S390)
+        disabled_wait(caller);
+#endif
+       for (i = 0;;) {
+               touch_softlockup_watchdog();
+               i += panic_blink(i);
+               msleep(1);
+               i++;
+       }
+}
+#endif
+
 EXPORT_SYMBOL(panic);
+EXPORT_SYMBOL(softpanic);
 
 /**
  *     print_tainted - return a string to represent the kernel taint state.