From 5fe01c891c0e10d27d368b11320fba9b3484c580 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 2 Feb 2007 08:10:30 -0800 Subject: [PATCH] --- yaml --- r: 46039 b: refs/heads/master c: 6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1 h: refs/heads/master i: 46037: f9b2f891367db2b8a5e1bc64bf05c571eeb51b45 46035: e8c4973aab339186cf495da878ffa4076a00f5fc 46031: 92c44e5e830ac2b0c110728247caeefa2f4f658f v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 6 ++++++ trunk/arch/i386/kernel/cpu/cyrix.c | 2 +- trunk/include/asm-sparc/checksum.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7b505419be2..c482ca143cf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 239a87c87660d3b97a467a661eec927f0dfa9891 +refs/heads/master: 6cdd12acb6ea1ad8cd523369d1c326cc26c91ca1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 465e083237a7..0ad8803a0c75 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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/trunk/arch/i386/kernel/cpu/cyrix.c b/trunk/arch/i386/kernel/cpu/cyrix.c index abcff92f994c..c0c3b59de32c 100644 --- a/trunk/arch/i386/kernel/cpu/cyrix.c +++ b/trunk/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/trunk/include/asm-sparc/checksum.h b/trunk/include/asm-sparc/checksum.h index 267e631e9bbc..34518ea7bf1b 100644 --- a/trunk/include/asm-sparc/checksum.h +++ b/trunk/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; }