diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfig
index 021ab62e3310..5512ebba0896 100644
--- a/fs/aufs/Kconfig
+++ b/fs/aufs/Kconfig
@@ -46,6 +46,7 @@ endchoice
 
 config AUFS_HNOTIFY
 	bool "Detect direct branch access (bypassing aufs)"
+	depends on !AUFS_FS=m
 	help
 	If you want to modify files on branches directly, eg. bypassing aufs,
 	and want aufs to detect the changes of them fully, then enable this
diff --git a/security/security.c b/security/security.c
index 687c6fd14bb6..aa87ae932826 100644
--- a/security/security.c
+++ b/security/security.c
@@ -467,6 +467,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
 		return 0;
 	return security_ops->path_chmod(dentry, mnt, mode);
 }
+EXPORT_SYMBOL(security_path_chmod);
 
 int security_path_chown(struct path *path, uid_t uid, gid_t gid)
 {
@@ -474,11 +475,13 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
 		return 0;
 	return security_ops->path_chown(path, uid, gid);
 }
+EXPORT_SYMBOL(security_path_chown);
 
 int security_path_chroot(struct path *path)
 {
 	return security_ops->path_chroot(path);
 }
+EXPORT_SYMBOL(security_path_chroot);
 #endif
 
 int security_inode_create(struct inode *dir, struct dentry *dentry, int mode)
@@ -496,6 +499,7 @@ int security_inode_link(struct dentry *old_dentry, struct inode *dir,
 		return 0;
 	return security_ops->inode_link(old_dentry, dir, new_dentry);
 }
+EXPORT_SYMBOL(security_inode_link);
 
 int security_inode_unlink(struct inode *dir, struct dentry *dentry)
 {
@@ -503,6 +507,7 @@ int security_inode_unlink(struct inode *dir, struct dentry *dentry)
 		return 0;
 	return security_ops->inode_unlink(dir, dentry);
 }
+EXPORT_SYMBOL(security_inode_unlink);
 
 int security_inode_symlink(struct inode *dir, struct dentry *dentry,
 			    const char *old_name)
@@ -511,6 +516,7 @@ int security_inode_symlink(struct inode *dir, struct dentry *dentry,
 		return 0;
 	return security_ops->inode_symlink(dir, dentry, old_name);
 }
+EXPORT_SYMBOL(security_inode_symlink);
 
 int security_inode_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
@@ -526,6 +532,7 @@ int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
 		return 0;
 	return security_ops->inode_rmdir(dir, dentry);
 }
+EXPORT_SYMBOL(security_inode_rmdir);
 
 int security_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 {
@@ -533,6 +540,7 @@ int security_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev
 		return 0;
 	return security_ops->inode_mknod(dir, dentry, mode, dev);
 }
+EXPORT_SYMBOL(security_inode_mknod);
 
 int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
 			   struct inode *new_dir, struct dentry *new_dentry)
@@ -543,6 +551,7 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
 	return security_ops->inode_rename(old_dir, old_dentry,
 					   new_dir, new_dentry);
 }
+EXPORT_SYMBOL(security_inode_rename);
 
 int security_inode_readlink(struct dentry *dentry)
 {