From b8ab1403bcb78b284766193c1afd8b8a17f1505e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 17 May 2012 01:18:19 +0000 Subject: [PATCH] Drop obsolete 'mips/ide: flush dcache also if icache does not snoop dcache' We no longer enable IDE drivers on MIPS, and libata uses flush_dcache_page() which has the right condition. svn path=/dists/sid/linux-2.6/; revision=19004 --- .../bugfix/mips/mips-ide-flush-dcache.patch | 46 ------------------- debian/patches/series/base | 1 - 2 files changed, 47 deletions(-) delete mode 100644 debian/patches/bugfix/mips/mips-ide-flush-dcache.patch diff --git a/debian/patches/bugfix/mips/mips-ide-flush-dcache.patch b/debian/patches/bugfix/mips/mips-ide-flush-dcache.patch deleted file mode 100644 index e6c22adb2..000000000 --- a/debian/patches/bugfix/mips/mips-ide-flush-dcache.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Sebastian Andrzej Siewior -Subject: mips/ide: flush dcache also if icache does not snoop dcache - -If this is not done then the new just read data which remains in dcache -will not make it into icache on time. Thus the CPU loads invalid data -and executes crap. The result is that the user is not able to execute -anything from its IDE based media while reading plain data is still -working well. -This problem has been reported as Debian #404951. - -Cc: stable@kernel.org -Signed-off-by: Sebastian Andrzej Siewior ---- - arch/mips/include/asm/mach-generic/ide.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/mips/include/asm/mach-generic/ide.h b/arch/mips/include/asm/mach-generic/ide.h -index 9c93a5b..e80e47f 100644 ---- a/arch/mips/include/asm/mach-generic/ide.h -+++ b/arch/mips/include/asm/mach-generic/ide.h -@@ -23,7 +23,7 @@ - static inline void __ide_flush_prologue(void) - { - #ifdef CONFIG_SMP -- if (cpu_has_dc_aliases) -+ if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc) - preempt_disable(); - #endif - } -@@ -31,14 +31,14 @@ static inline void __ide_flush_prologue(void) - static inline void __ide_flush_epilogue(void) - { - #ifdef CONFIG_SMP -- if (cpu_has_dc_aliases) -+ if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc) - preempt_enable(); - #endif - } - - static inline void __ide_flush_dcache_range(unsigned long addr, unsigned long size) - { -- if (cpu_has_dc_aliases) { -+ if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc) { - unsigned long end = addr + size; - - while (addr < end) { diff --git a/debian/patches/series/base b/debian/patches/series/base index 1f3df4a1e..1069ed069 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -31,7 +31,6 @@ + debian/rds-Disable-auto-loading-as-mitigation-against-local.patch + debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch -+ bugfix/mips/mips-ide-flush-dcache.patch + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch + features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch