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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Martin Michlmayr <tbm@xxxxxxxxxx> [2006-02-20 00:01]:
> I noticed the following difference between the Linus and the
> linux-mips tree.  Who is correct and can the other one be changed
> please?

ping.


> --- 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/

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


[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux