summaryrefslogtreecommitdiff
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-10-12 05:30:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-10-12 05:30:16 -0700
commitbbaf766c22fc4745fbf4494037a62a21ad7c5ecc (patch)
treea0cac8263692d7aba4fad5feae5ad4ab195bdd95 /mm/shmem.c
parent51abefff9fb42c8834acb643d6aa70d855e0cf43 (diff)
parent1065e41df3d0060f67ea0b2432b252dc9acca341 (diff)
Merge "Merge android-4.4.159 (624c095) into msm-4.4"
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 9bdb044d4dee..6318fc7883c4 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1464,6 +1464,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
mpol_shared_policy_init(&info->policy, NULL);
break;
}
+
+ lockdep_annotate_inode_mutex_key(inode);
} else
shmem_free_inode(sb);
return inode;