3 files changed, 8 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 465e083237a7..0ad8803a0c75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3593,6 +3593,12 @@ M:	ysato@users.sourceforge.jp
 W:      http://uclinux-h8.sourceforge.jp/
 S:      Supported
 
+UFS FILESYSTEM
+P: Evgeniy Dushistov
+M: dushistov@mail.ru
+L: linux-kernel@vger.kernel.org
+S: Maintained
+
 USB DIAMOND RIO500 DRIVER
 P:      Cesar Miquel
 M:      miquel@df.uba.ar
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index abcff92f994c..c0c3b59de32c 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -173,7 +173,7 @@ static void __cpuinit geode_configure(void)
         ccr4 = getCx86(CX86_CCR4);
         ccr4 |= 0x38;           /* FPU fast, DTE cache, Mem bypass */
         
-        setCx86(CX86_CCR4, ccr4);
+        setCx86(CX86_CCR3, ccr3);
         
         set_cx86_memwb();
         set_cx86_reorder();     
diff --git a/include/asm-sparc/checksum.h b/include/asm-sparc/checksum.h
index 267e631e9bbc..34518ea7bf1b 100644
--- a/include/asm-sparc/checksum.h
+++ b/include/asm-sparc/checksum.h
@@ -151,7 +151,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
                              "xnor\t%%g0, %0, %0"
                              : "=r" (sum), "=&r" (iph)
                              : "r" (ihl), "1" (iph)
-                             : "g2", "g3", "g4", "cc");
+                             : "g2", "g3", "g4", "cc", "memory");
         return sum;
 }