diff --git a/[refs] b/[refs]
index 16fc04ee2c2b..cb883af0f89a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 086f68bd97126618ecb2dcff5f766f3a21722df7
+refs/heads/master: 0f59e61c1f034b8088086bc85dc777af2ad3e836
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index 89142b39fec1..c635b03accb1 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/fs/cifs/cifsfs.c
@@ -1045,8 +1045,8 @@ init_cifs(void)
 	return 0;
 
  out_unregister_resolver_key:
-	unregister_key_type(&key_type_dns_resolver);
 #ifdef CONFIG_CIFS_DFS_UPCALL
+	unregister_key_type(&key_type_dns_resolver);
  out_unregister_key_type:
 #endif
 #ifdef CONFIG_CIFS_UPCALL