diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-05 15:03:14 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-10-05 15:03:14 -0300 |
| commit | 1b4e750eb5f2893ce32845a36b5cfcbd0565f935 (patch) | |
| tree | 005dec14b62f4c9fdebba92903e2b36f75aba3c8 /kernels/linux-libre-xen | |
| parent | 649c0832ffc290fb02dcda4d57a98fb078199f44 (diff) | |
linux-libre-{pae,xen}-3.11.3-1: updating version
Diffstat (limited to 'kernels/linux-libre-xen')
| -rw-r--r-- | kernels/linux-libre-xen/3.11.1-fix-skge.patch | 34 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 9 |
2 files changed, 2 insertions, 41 deletions
diff --git a/kernels/linux-libre-xen/3.11.1-fix-skge.patch b/kernels/linux-libre-xen/3.11.1-fix-skge.patch deleted file mode 100644 index 26d90e080..000000000 --- a/kernels/linux-libre-xen/3.11.1-fix-skge.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400 -+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400 -@@ -3086,23 +3086,27 @@ - PCI_DMA_FROMDEVICE); - skge_rx_reuse(e, skge->rx_buf_size); - } else { -+ struct skge_element ee; - struct sk_buff *nskb; - - nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size); - if (!nskb) - goto resubmit; - -+ ee = *e; -+ -+ skb = ee.skb; -+ prefetch(skb->data); -+ - if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) { - dev_kfree_skb(nskb); - goto resubmit; - } - - pci_unmap_single(skge->hw->pdev, -- dma_unmap_addr(e, mapaddr), -- dma_unmap_len(e, maplen), -+ dma_unmap_addr(&ee, mapaddr), -+ dma_unmap_len(&ee, maplen), - PCI_DMA_FROMDEVICE); -- skb = e->skb; -- prefetch(skb->data); - } - - skb_put(skb, len); diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index eeafa749f..1aac49360 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195190 2013-09-27 06:12:11Z tpowa $ +# $Id: PKGBUILD 195840 2013-10-02 00:02:27Z thomas $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -pkgver=${_basekernel}.2 +pkgver=${_basekernel}.3 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.11.1-fix-skge.patch' '3.11-haswell-intel_pstate.patch') md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '33426579c358003b46a3cc2171ae6505' @@ -31,7 +30,6 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '4fcee2b4485492dcfdead632275198eb' '1040ae6c10d4a68f89899f94a2318a17') _kernelname=${pkgbase#linux-libre} @@ -52,9 +50,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # #36865 fix broken skge network module - patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch" - # add intel haswell support to intel_pstate # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37 # will be in 3.12 |