diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-29 17:47:18 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-29 17:47:18 -0700 |
| commit | e45e777c373c14b744b2940d806cf02dad84b42f (patch) | |
| tree | ce674f8c6f58e79fa1b89b9c5c7d70e3a0553685 | |
| parent | c7c677bc7b5906fa5e42b8a77442908ab7fed6f9 (diff) | |
| download | nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar.gz nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar.bz2 nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar.lz nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar.xz nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.tar.zst nixlib-e45e777c373c14b744b2940d806cf02dad84b42f.zip | |
kernel: Remove uneeded patch for 4.2
| -rw-r--r-- | pkgs/os-specific/linux/kernel/flush_workqueue-export.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.2.nix | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch b/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch deleted file mode 100644 index 17583e317306..000000000000 --- a/pkgs/os-specific/linux/kernel/flush_workqueue-export.patch +++ /dev/null @@ -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 diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index 7584f69937d5..56914ae9cdec 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -14,12 +14,4 @@ import ./generic.nix (args // rec { features.needsCifsUtils = true; features.canDisableNetfilterConntrackHelpers = 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 {})) |