Merge branch 'linus' into rt/head

Conflicts:
	Makefile

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index 0d83edcfc402..2d4d05d92fda 100644
--- a/security/integrity/ima/ima_iint.c
+++ b/security/integrity/ima/ima_iint.c
@@ -63,12 +63,11 @@ int ima_inode_alloc(struct inode *inode)
         spin_lock(&ima_iint_lock);
         rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint);
         spin_unlock(&ima_iint_lock);
+        radix_tree_preload_end();
 out:
         if (rc < 0)
                 kmem_cache_free(iint_cache, iint);
 
-        radix_tree_preload_end();
-
         return rc;
 }