diff --git a/debian/changelog b/debian/changelog index a79cce08b..2afd285bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,7 @@ linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low * [arm/iop32x] Do not build the ARTOP PATA driver (PATA_ARTOP). * [arm/iop32x] Register the F75375 device in the GLAN Tank platform code. * Prevent physmap from calling request_module() too early. + * [arm/ixp4xx] Fix used_sram_bitmap corruption in qmgr_release_queue(). [ Aurelien Jarno ] * [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks diff --git a/debian/patches/bugfix/arm/fix-ixp4xx_qmgr-used_sram_bitmap-corruption.patch b/debian/patches/bugfix/arm/fix-ixp4xx_qmgr-used_sram_bitmap-corruption.patch new file mode 100644 index 000000000..851025285 --- /dev/null +++ b/debian/patches/bugfix/arm/fix-ixp4xx_qmgr-used_sram_bitmap-corruption.patch @@ -0,0 +1,18 @@ +IXP4xx: fix used_sram_bitmap corruption in qmgr_release_queue() + +Signed-off-by: Krzysztof Hałasa +--- + +diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +index e833013..fab94ea 100644 +--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue) + case 3: mask[0] = 0xFF; break; + } + ++ mask[1] = mask[2] = mask[3] = 0; ++ + while (addr--) + shift_mask(mask); + diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index 0bcbb2d59..e8184a8ca 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -43,3 +43,4 @@ + bugfix/all/rtc-x1205-new-style-conversion-checkpatch-fixes.patch + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch + features/all/firewire-git.patch ++ bugfix/arm/fix-ixp4xx_qmgr-used_sram_bitmap-corruption.patch