Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=87bdd519a561946e00835bd501eb63f1c9a931ad
commit 87bdd519a561946e00835bd501eb63f1c9a931ad Author: DeX77 <[email protected]> Date: Mon May 1 16:58:37 2017 +0200 frugalware-2.1-69-x86_64 * replase e1000e diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index 62d67c6..37090ea 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -4,7 +4,7 @@ pkgname=frugalware pkgver=2.1 -pkgrel=68 +pkgrel=69 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/"; depends=() @@ -564,7 +564,7 @@ replaces=("${replaces[@]}" 'atanks' 'atl2' 'attica-qt5' 'aurorae' 'auteur' 'avan 'topgit' 'touchkit' 'tpctl' 'tpty' 'transkode' 'trashcan' 'trayfreq' 'traylib' 'tuneroid' 'tuntun' 'tvision' 'twinkle' 'xcursor-theme-vanilla-dmz' 'xcursor-theme-vanilla-dmz-aa' 'xdgstart' \ 'xdm-frugalware' 'xespgs' 'xfmedia' 'xkbdata' 'xlhtml' 'xmame' 'xmame-roms' 'xmix' 'xmmplayer' 'xmms2-scrobbler' 'xmule' 'xnoise' 'xnoise-plugins-core' 'xournal' 'xpenguinsapplet' 'xphelloworld' \ 'xvba-video' 'xvidcap' 'xz-utils' 'yaboot' 'yeahlaunch' 'ypbind-mt' 'zapping' 'zeitgeist-datahub' 'zenshot' 'zisofs-tools' 'zynjacku' 'pcsx2' 'lemon' 'chkconfig' 'kdebase-runtime-compiletime' \ - 'kdebase-workspace-compiletime' 'kdelibs-compiletime' 'pm-radeon' 'shared-desktop-ontologies' 'eigen2' 'md5deep' 'libreoffice-mozilla') + 'kdebase-workspace-compiletime' 'kdelibs-compiletime' 'pm-radeon' 'shared-desktop-ontologies' 'eigen2' 'md5deep' 'libreoffice-mozilla' 'e1000e') ## Qt4 replaces+=('qwt-designer-plugin' 'qwt' 'qwt-docs' 'qemuctl' 'razor-qt' 'vym' 'dboxfetray' 'dboxfe' 'ibus-qt' 'converseen' 'fwbuilder' 'johnny' ' monkeystudio' 'qasmixer' 'qfacture' \ 'qlipper' 'qmediainfo' 'qstardict' 'qtfm' 'qtm' 'qucs' 'qxkb' 'screengrab-qt' 'skype' 'sqliteman' 'synergy' 'pyside' 'pyside-tools' 'yubikey-neo-manager' 'qt4-docs' \ diff --git a/source/network-extra/e1000e/FrugalBuild b/source/network-extra/e1000e/FrugalBuild deleted file mode 100644 index a050876..0000000 --- a/source/network-extra/e1000e/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: 1 SBU -# Maintainer: DeX77 <[email protected]> - -pkgname=e1000e -pkgver=3.3.5.3 -pkgrel=23 -pkgdesc="Intel e1000e Ethernet adapter driver" -archs=('x86_64') -groups=('network-extra') -_F_sourceforge_dirname="e1000" -_F_sourceforge_rss_limit=100 -Finclude sourceforge kernel-module -source+=("kernel-4.10.patch" "mainline-backports.patch") -sha1sums=('03031b5be7e25808bd6dfe2672fc1347d86dd39b' \ - '766c96f3a8195ecf08ba7cdff9462f353f00f6a4' \ - 'b77118b5468dc04618fbca8062664c522df622f1') -options+=('nostrip') - -build() { - Fpatchall - cd src/ - - Fmake - Ffilerel e1000e.ko $_F_kernelmod_dir/updates/drivers/net/ethernet/intel/e1000e/e1000e.ko - Fbuild_kernelmod_scriptlet -} diff --git a/source/network-extra/e1000e/kernel-4.10.patch b/source/network-extra/e1000e/kernel-4.10.patch deleted file mode 100644 index d8838bc..0000000 --- a/source/network-extra/e1000e/kernel-4.10.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -Naur e1000e-3.3.5.3/src/netdev.c e1000e-3.3.5.3.new/src/netdev.c ---- e1000e-3.3.5.3/src/netdev.c 2016-11-09 17:39:01.000000000 +0100 -+++ e1000e-3.3.5.3.new/src/netdev.c 2017-02-23 17:57:39.000000000 +0100 -@@ -4833,24 +4833,24 @@ - /** - * e1000e_sanitize_systim - sanitize raw cycle counter reads - * @hw: pointer to the HW structure -- * @systim: cycle_t value read, sanitized and returned -+ * @systim: u64 value read, sanitized and returned - * - * Errata for 82574/82583 possible bad bits read from SYSTIMH/L: - * check to see that the time is incrementing at a reasonable - * rate and is a multiple of incvalue. - **/ --static cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t systim) -+static u64 e1000e_sanitize_systim(struct e1000_hw *hw, u64 systim) - { - u64 time_delta, rem, temp; -- cycle_t systim_next; -+ u64 systim_next; - u32 incvalue; - int i; - - incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK; - for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) { - /* latch SYSTIMH on read of SYSTIML */ -- systim_next = (cycle_t)er32(SYSTIML); -- systim_next |= (cycle_t)er32(SYSTIMH) << 32; -+ systim_next = (u64)er32(SYSTIML); -+ systim_next |= (u64)er32(SYSTIMH) << 32; - - time_delta = systim_next - systim; - temp = time_delta; -@@ -4872,13 +4872,13 @@ - * e1000e_cyclecounter_read - read raw cycle counter (used by time counter) - * @cc: cyclecounter structure - **/ --static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc) -+static u64 e1000e_cyclecounter_read(const struct cyclecounter *cc) - { - struct e1000_adapter *adapter = container_of(cc, struct e1000_adapter, - cc); - struct e1000_hw *hw = &adapter->hw; - u32 systimel, systimeh; -- cycle_t systim; -+ u64 systim; - /* SYSTIMH latching upon SYSTIML read does not work well. - * This means that if SYSTIML overflows after we read it but before - * we read SYSTIMH, the value of SYSTIMH has been incremented and we -@@ -4899,8 +4899,8 @@ - systimel = systimel_2; - } - } -- systim = (cycle_t)systimel; -- systim |= (cycle_t)systimeh << 32; -+ systim = (u64)systimel; -+ systim |= (u64)systimeh << 32; - - if (adapter->flags2 & FLAG2_CHECK_SYSTIM_OVERFLOW) - systim = e1000e_sanitize_systim(hw, systim); -diff -Naur e1000e-3.3.5.3/src/ptp.c e1000e-3.3.5.3.new/src/ptp.c ---- e1000e-3.3.5.3/src/ptp.c 2016-11-09 17:39:01.000000000 +0100 -+++ e1000e-3.3.5.3.new/src/ptp.c 2017-02-23 17:57:36.000000000 +0100 -@@ -136,8 +136,8 @@ - unsigned long flags; - int i; - u32 tsync_ctrl; -- cycle_t dev_cycles; -- cycle_t sys_cycles; -+ u64 dev_cycles; -+ u64 sys_cycles; - - tsync_ctrl = er32(TSYNCTXCTL); - tsync_ctrl |= E1000_TSYNCTXCTL_START_SYNC | diff --git a/source/network-extra/e1000e/mainline-backports.patch b/source/network-extra/e1000e/mainline-backports.patch deleted file mode 100644 index 240e553..0000000 --- a/source/network-extra/e1000e/mainline-backports.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur e1000e-3.3.5.3/src/netdev.c e1000e-3.3.5.3-p/src/netdev.c ---- e1000e-3.3.5.3/src/netdev.c 2016-11-09 17:39:01.000000000 +0100 -+++ e1000e-3.3.5.3-p/src/netdev.c 2017-03-03 22:27:21.345067617 +0100 -@@ -7665,19 +7665,19 @@ - - vector = 0; - msix_irq = adapter->msix_entries[vector].vector; -- disable_irq(msix_irq); -+ disable_hardirq(msix_irq); - e1000_intr_msix_rx(msix_irq, netdev); - enable_irq(msix_irq); - - vector++; - msix_irq = adapter->msix_entries[vector].vector; -- disable_irq(msix_irq); -+ disable_hardirq(msix_irq); - e1000_intr_msix_tx(msix_irq, netdev); - enable_irq(msix_irq); - - vector++; - msix_irq = adapter->msix_entries[vector].vector; -- disable_irq(msix_irq); -+ disable_hardirq(msix_irq); - e1000_msix_other(msix_irq, netdev); - enable_irq(msix_irq); - } -@@ -7702,13 +7702,13 @@ - e1000_intr_msix(adapter->pdev->irq, netdev); - break; - case E1000E_INT_MODE_MSI: -- disable_irq(adapter->pdev->irq); -- e1000_intr_msi(adapter->pdev->irq, netdev); -+ if (disable_hardirq(adapter->pdev->irq)) -+ e1000_intr_msi(adapter->pdev->irq, netdev); - enable_irq(adapter->pdev->irq); - break; - default: /* E1000E_INT_MODE_LEGACY */ -- disable_irq(adapter->pdev->irq); -- e1000_intr(adapter->pdev->irq, netdev); -+ if (disable_hardirq(adapter->pdev->irq)) -+ e1000_intr(adapter->pdev->irq, netdev); - enable_irq(adapter->pdev->irq); - break; - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
