Revert "linux kernel 4.4: fix race during build"

Removes patch. Was fixed upstream.

This reverts commit 4788ec1372.
This commit is contained in:
obadz 2016-08-12 16:41:42 +01:00
parent a4a9c4fae3
commit b2efe2babd
3 changed files with 0 additions and 15 deletions

View file

@ -136,10 +136,6 @@ rec {
{ name = "mfd_fix_dependency";
patch = ./chromiumos-patches/mfd-fix-dependency.patch;
};
qat_common_Makefile =
{ name = "qat_common_Makefile";
patch = ./qat_common_Makefile.patch;
};
hiddev_CVE_2016_5829 =
{ name = "hiddev_CVE_2016_5829";

View file

@ -1,10 +0,0 @@
--- a/drivers/crypto/qat/qat_common/Makefile
+++ b/drivers/crypto/qat/qat_common/Makefile
@@ -2,6 +2,7 @@
$(obj)/qat_rsapubkey-asn1.h
$(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \
$(obj)/qat_rsaprivkey-asn1.h
+$(obj)/qat_asym_algs.o: $(obj)/qat_rsaprivkey-asn1.h $(obj)/qat_rsapubkey-asn1.h
clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h
clean-files += qat_rsaprivkey-asn1.c qat_rsapvivkey-asn1.h

View file

@ -11151,7 +11151,6 @@ in
linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.qat_common_Makefile
kernelPatches.hiddev_CVE_2016_5829
]
++ lib.optionals ((platform.kernelArch or null) == "mips")