apparmor-hash.diff

--- a/security/apparmor/policy_unpack.c	2017-04-17 21:12:26.765200867 -0700
+++ b/security/apparmor/policy_unpack.c	2017-04-17 21:11:48.449086006 -0700
@@ -941,9 +941,11 @@
 		if (error)
 			goto fail_profile;
 
+#ifdef CONFIG_SECURITY_APPARMOR_HASH
 		if (aa_g_hash_policy)
 			error = aa_calc_profile_hash(profile, e.version, start,
 						     e.pos - start);
+#endif
 		if (error)
 			goto fail_profile;
 
@@ -958,6 +960,7 @@
 		list_add_tail(&ent->list, lh);
 	}
 	udata->abi = e.version & K_ABI_MASK;
+#ifdef CONFIG_SECURITY_APPARMOR_HASH
 	if (aa_g_hash_policy) {
 		udata->hash = aa_calc_hash(udata->data, udata->size);
 		if (IS_ERR(udata->hash)) {
@@ -966,6 +969,7 @@
 			goto fail;
 		}
 	}
+#endif
 	return 0;
 
 fail_profile: