core/linux fix nsa310 boardfile / update BFQ to v6r1

core/linux/PKGBUILD

@@ -12,7 +12,7 @@ _basekernel=3.1
 pkgver=${_basekernel}.10
 pkgrel=20
 cryptover=1.6
-bfqver=v6
+bfqver=v6r1
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -34,12 +34,12 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.patch"
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
-        "http://dl.dropbox.com/u/15043728/ArchLinuxArm/kernels/0001-block-bfq-attempt-to-fix-use-after-free-which-2.6.38-to-3.2.0.patch"
+        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0004-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
         "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
 
 md5sums=('8d43453f8159b2332ad410b19d86a931'
          'a8e1c25a93a685ec2a1c3a808715fe9d'
-         'bb33e83edfdfa267e47a7b56d4f47e62'
+         '24d6258eaedad8cb5c43457d860544ff'
          '61dbbcdb0f35032ea7f82c5b1ef7c769'
          'f5d3635da03cb45904bedd69b47133de'
          '3f64ed9d71499fe9293dc671f4e4087e'
@@ -50,10 +50,10 @@ md5sums=('8d43453f8159b2332ad410b19d86a931'
          'b7d1b8fd444141a562505b768264b1a4'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd00814b57448895e65fbbc800e8a58ba'
-         'f623636044a51e198e148bb1f922cb0e'
-         '13d6835fbde773db9dd910f5c60b5fd8'
-         '6c33fef6961b2f5599c086bac8cc23ab'
-         '091dd30a3db13e0f1b5292d6813f6214'
+         '197caa69272a2367d60fb5c2406c3c0f'
+         'b49f08c106f2a942781d9db166b543a4'
+         'f27ed19fad2055ab8217f8eda5709fa7'
+         'f65d133968d88bfaa7aae1496800266f'
          'eade38998313c25fd7934719cdf8a2ea')
 
 build() {
@@ -80,8 +80,7 @@ msg2 "Add BFQ I/O scheduler patches"
   patch -Np1 -i "${srcdir}/0001-block-prepare-I-O-context-code-for-BFQ-${bfqver}-for-${_basekernel}.patch"
   patch -Np1 -i "${srcdir}/0002-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
   patch -Np1 -i "${srcdir}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
-msg2 "Fix a possible BFQ bug"
-  patch -Np1 -i "${srcdir}/0001-block-bfq-attempt-to-fix-use-after-free-which-2.6.38-to-3.2.0.patch"
+  patch -Np1 -i "${srcdir}/0004-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
 
 msg2 "Add AUFS3 patches"
   patch -Np1 -i "${srcdir}/aufs3-kbuild.patch"

core/linux/archlinuxarm.patch

@@ -7213,7 +7213,7 @@ diff -rupN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa3
 +subsys_initcall(nsa310_pci_init);
 +
 +MACHINE_START(NSA310, "Zyxel NSA-310")
-+  .atag_offset  = 0x100,
++  .boot_params  = 0x00000100,
 +  .init_machine  = nsa310_init,
 +  .map_io    = kirkwood_map_io,
 +  .init_early    = kirkwood_init_early,