linux-cvs
[Top] [All Lists]

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

To: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Subject: Re: CVS Update@oss.sgi.com: linux
From: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
Date: Mon, 1 Jul 2002 18:14:16 +0200
Cc: linux-cvs@oss.sgi.com, Ralf Baechle <ralf@oss.sgi.com>
In-reply-to: <20020701123744.GQ17216@lug-owl.de>
References: <200207010005.g6105xIR027544@oss.sgi.com> <20020701123744.GQ17216@lug-owl.de>
Sender: owner-linux-cvs@oss.sgi.com
User-agent: Mutt/1.3.28i
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);


<Prev in Thread] Current Thread [Next in Thread>