linux-mips
[Top] [All Lists]

Re: Diff between Linus' and linux-mips git: small changes

To: linux-mips@linux-mips.org
Subject: Re: Diff between Linus' and linux-mips git: small changes
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 20 Feb 2006 00:01:41 +0000
Cc: ppopov@mvista.com, dtor_core@ameritech.net
In-reply-to: <20060219234318.GA16311@deprecation.cyrius.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060219234318.GA16311@deprecation.cyrius.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.11
I noticed the following difference between the Linus and the
linux-mips tree.  Who is correct and can the other one be changed
please?

--- linux-2.6.16-rc4/drivers/char/qtronix.c     2006-02-19 20:08:44.000000000 
+0000
+++ mips-2.6.16-rc4/drivers/char/qtronix.c      2006-02-19 20:15:07.000000000 
+0000
@@ -535,8 +535,7 @@
                i--;
        }
        if (count-i) {
-               struct inode *inode = file->f_dentry->d_inode;
-               inode->i_atime = current_fs_time(inode->i_sb);
+               file->f_dentry->d_inode->i_atime = get_seconds();
                return count-i;
        }
        if (signal_pending(current))

-- 
Martin Michlmayr
http://www.cyrius.com/

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