Merge commit 'origin/master' into next

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h

2 files changed, 2 insertions, 3 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;
 }
 
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index 68c7348d1acc..04b6145d767f 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -128,7 +128,7 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap,
                         cmap_idx = delta / NETLBL_CATMAP_MAPSIZE;
                         cmap_sft = delta % NETLBL_CATMAP_MAPSIZE;
                         c_iter->bitmap[cmap_idx]
-                                |= e_iter->maps[cmap_idx] << cmap_sft;
+                                |= e_iter->maps[i] << cmap_sft;
                 }
                 e_iter = e_iter->next;
         }