Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index c1b72388e57115747790948a172312738997fb0a..e69ebe648a34bd69b1a0242fbdb5bb737edee2e9 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -68,7 +68,6 @@ static struct inode *proc_alloc_inode(struct super_block *sb)
        ei->sysctl_entry = NULL;
        ei->ns_ops = NULL;
        inode = &ei->vfs_inode;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        return inode;
 }
 
@@ -421,7 +420,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 
        if (inode) {
                inode->i_ino = de->low_ino;
-               inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+               inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
                PROC_I(inode)->pde = de;
 
                if (is_empty_pde(de)) {