[kernel] r15844 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series
Aurelien Jarno
aurel32 at alioth.debian.org
Tue Jun 8 16:11:24 UTC 2010
Author: aurel32
Date: Tue Jun 8 16:11:18 2010
New Revision: 15844
Log:
* [mips] backport mips/swarm: fix M3 TLB exception handler.
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/bugfix/mips/sibyte-m3-tlb-exception.patch
dists/sid/linux-2.6/debian/patches/series/16
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Tue Jun 8 16:08:57 2010 (r15843)
+++ dists/sid/linux-2.6/debian/changelog Tue Jun 8 16:11:18 2010 (r15844)
@@ -19,6 +19,7 @@
[ Aurelien Jarno ]
* [sh4] fix sh_tmu clocksource following recent nohz changes.
+ * [mips] backport mips/swarm: fix M3 TLB exception handler.
[ Moritz Muehlenhoff ]
* Enable X86 board specific fixups for reboot (Closes: #536537)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/sibyte-m3-tlb-exception.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/sibyte-m3-tlb-exception.patch Tue Jun 8 16:08:57 2010 (r15843)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/sibyte-m3-tlb-exception.patch Tue Jun 8 16:11:18 2010 (r15844)
@@ -1,62 +1,3 @@
-commit 8d9df29db273ab9a330828f4f4f6669d293a730a
-Author: Ralf Baechle <ralf at linux-mips.org>
-Date: Tue Mar 23 00:02:43 2010 +0100
-
- MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions.
-
- Previously it was unconditionally used on all Sibyte family SOCs. The
- M3 bug has to be handled in the TLB exception handler which is extremly
- performance sensitive, so this modification is expected to deliver around
- 2-3% performance improvment. This is important as required changes to the
- M3 workaround will make it more costly.
-
- Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
-
-diff --git a/arch/mips/include/asm/mach-sibyte/war.h b/arch/mips/include/asm/mach-sibyte/war.h
-index 7950ef4..743385d 100644
---- a/arch/mips/include/asm/mach-sibyte/war.h
-+++ b/arch/mips/include/asm/mach-sibyte/war.h
-@@ -16,7 +16,11 @@
- #if defined(CONFIG_SB1_PASS_1_WORKAROUNDS) || \
- defined(CONFIG_SB1_PASS_2_WORKAROUNDS)
-
--#define BCM1250_M3_WAR 1
-+#ifndef __ASSEMBLY__
-+extern int sb1250_m3_workaround_needed(void);
-+#endif
-+
-+#define BCM1250_M3_WAR sb1250_m3_workaround_needed()
- #define SIBYTE_1956_WAR 1
-
- #else
-diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
-index 0444da1..92da315 100644
---- a/arch/mips/sibyte/sb1250/setup.c
-+++ b/arch/mips/sibyte/sb1250/setup.c
-@@ -87,6 +87,21 @@ static int __init setup_bcm1250(void)
- return ret;
- }
-
-+int sb1250_m3_workaround_needed(void)
-+{
-+ switch (soc_type) {
-+ case K_SYS_SOC_TYPE_BCM1250:
-+ case K_SYS_SOC_TYPE_BCM1250_ALT:
-+ case K_SYS_SOC_TYPE_BCM1250_ALT2:
-+ case K_SYS_SOC_TYPE_BCM1125:
-+ case K_SYS_SOC_TYPE_BCM1125H:
-+ return soc_pass < K_SYS_REVISION_BCM1250_C0;
-+
-+ default:
-+ return 0;
-+ }
-+}
-+
- static int __init setup_bcm112x(void)
- {
- int ret = 0;
-
-
commit 5808184f1b2fe06ef8a54a2b7fb1596d58098acf
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Tue Mar 23 15:54:50 2010 +0100
Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16 Tue Jun 8 16:08:57 2010 (r15843)
+++ dists/sid/linux-2.6/debian/patches/series/16 Tue Jun 8 16:11:18 2010 (r15844)
@@ -126,3 +126,4 @@
+ features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
- bugfix/all/thinkpad-acpi-add-x100e.patch
+ bugfix/all/sctp-fix-append-error-cause-to-ERROR-chunk-correctly.patch
++ bugfix/mips/sibyte-m3-tlb-exception.patch
More information about the Kernel-svn-changes
mailing list