2 files changed, 6 insertions, 2 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index f2661610fcf3..260025fd8c3b 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1177,9 +1177,7 @@ exit_cifs(void)
         cFYI(DBG2, "exit_cifs");
         cifs_proc_clean();
         cifs_fscache_unregister();
-#ifdef CONFIG_CIFS_DFS_UPCALL
         cifs_dfs_release_automount_timer();
-#endif
 #ifdef CONFIG_CIFS_ACL
         cifs_destroy_idmaptrees();
         exit_cifs_idmap();
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 47a769e535b1..503e73d8bdb7 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -171,7 +171,13 @@ extern struct smb_vol *cifs_get_volume_info(char *mount_data,
                                             const char *devname);
 extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
 extern void cifs_umount(struct cifs_sb_info *);
+
+#if IS_ENABLED(CONFIG_CIFS_DFS_UPCALL)
 extern void cifs_dfs_release_automount_timer(void);
+#else /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
+#define cifs_dfs_release_automount_timer()      do { } while (0)
+#endif /* ! IS_ENABLED(CONFIG_CIFS_DFS_UPCALL) */
+
 void cifs_proc_init(void);
 void cifs_proc_clean(void);