Re: CVS Update@oss.sgi.com: linux

[Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>]

Jan-Benedict Glaw wrote:
[snip]
> >     arch/mips/kernel: Tag: linux_2_4 traps.c 
> 
> Does currently not compile:
> 
> void __die(const char * str, struct pt_regs * regs, const char * file,
>            const char * func, unsigned long line)
> {       
>         console_verbose();
>         spin_lock_irq(&die_lock);
>         printk("%s", str);
>         if (where)
>             ^^^^^
>                 printk(" in %s:%s, line %ld", file, func, line);

Copy&Paste bug. This patch fixes it.


Thiemo


--- source-linux-orig/arch/mips/kernel/traps.c  Mon Jul  1 12:05:04 2002
+++ source-linux/arch/mips/kernel/traps.c       Mon Jul  1 18:09:19 2002
@@ -331,7 +330,7 @@ void __die(const char * str, struct pt_r
        console_verbose();
        spin_lock_irq(&die_lock);
        printk("%s", str);
-       if (where)
+       if (file && func)
                printk(" in %s:%s, line %ld", file, func, line);
        printk(":\n");
        show_registers(regs);