diff --git a/[refs] b/[refs]
index a756560971b7..23a5f0b03ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e713b5fdd0e54c2e3c8909ccde2a98839e3a52
+refs/heads/master: 5d57bd39eb3dbf2866b5f5cee8fbd7a29b00c56f
diff --git a/trunk/mm/tiny-shmem.c b/trunk/mm/tiny-shmem.c
index c13a2161bca2..b58abcf44ed6 100644
--- a/trunk/mm/tiny-shmem.c
+++ b/trunk/mm/tiny-shmem.c
@@ -31,11 +31,14 @@ static struct vfsmount *shm_mnt;
 
 static int __init init_tmpfs(void)
 {
-	register_filesystem(&tmpfs_fs_type);
+	BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
+
 #ifdef CONFIG_TMPFS
 	devfs_mk_dir("shm");
 #endif
 	shm_mnt = kern_mount(&tmpfs_fs_type);
+	BUG_ON(IS_ERR(shm_mnt));
+
 	return 0;
 }
 module_init(init_tmpfs)