forked from mirrors/nixpkgs
kernel: Remove uneeded patch for 4.2
This commit is contained in:
parent
c7c677bc7b
commit
e45e777c37
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
|
|
||||||
index 4c4f061..a413acb 100644
|
|
||||||
--- a/kernel/workqueue.c
|
|
||||||
+++ b/kernel/workqueue.c
|
|
||||||
@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq)
|
|
||||||
out_unlock:
|
|
||||||
mutex_unlock(&wq->mutex);
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(flush_workqueue);
|
|
||||||
+EXPORT_SYMBOL(flush_workqueue);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* drain_workqueue - drain a workqueue
|
|
|
@ -14,12 +14,4 @@ import ./generic.nix (args // rec {
|
||||||
features.needsCifsUtils = true;
|
features.needsCifsUtils = true;
|
||||||
features.canDisableNetfilterConntrackHelpers = true;
|
features.canDisableNetfilterConntrackHelpers = true;
|
||||||
features.netfilterRPFilter = true;
|
features.netfilterRPFilter = true;
|
||||||
|
|
||||||
# cherry-pick from upstream to resolve a licensing problem that prevents
|
|
||||||
# compiling the broadcom-sta wireless driver on kernels >= 4.2
|
|
||||||
# see: https://github.com/longsleep/bcmwl-ubuntu/issues/6
|
|
||||||
kernelPatches = [ {
|
|
||||||
name = "flush-workqueue-export";
|
|
||||||
patch = ./flush_workqueue-export.patch;
|
|
||||||
} ];
|
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
Loading…
Reference in a new issue