Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:10:58 +0000 (08:10 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Feb 2007 16:10:58 +0000 (08:10 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6:
  [BNX2]: PHY workaround for 5709 A0.

MAINTAINERS
arch/i386/kernel/cpu/cyrix.c
include/asm-sparc/checksum.h
net/sched/act_ipt.c

index 465e083237a784fa2dd1ec786065b7d0fe8ebec5..0ad8803a0c7555ae3667846d2445ea9810a6802b 100644 (file)
@@ -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
index abcff92f994c06eafd9aa52f13b1401498c789fa..c0c3b59de32c4d183b677e843ffacffa5aa2f1bb 100644 (file)
@@ -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();     
index 267e631e9bbc345f2bbfafba3aeeade19c87d409..34518ea7bf1b5312dfe92ecdc4f11403edbad4e2 100644 (file)
@@ -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;
 }
 
index a9608064a4c303cb884b0fc6913d1f68e2fd33ee..01e69138578da0cc9db6151493a3312d5573011c 100644 (file)
@@ -55,7 +55,8 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
        struct ipt_target *target;
        int ret = 0;
 
-       target = xt_find_target(AF_INET, t->u.user.name, t->u.user.revision);
+       target = xt_request_find_target(AF_INET, t->u.user.name,
+                                       t->u.user.revision);
        if (!target)
                return -ENOENT;
 
@@ -63,9 +64,10 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
 
        ret = xt_check_target(target, AF_INET, t->u.target_size - sizeof(*t),
                              table, hook, 0, 0);
-       if (ret)
+       if (ret) {
+               module_put(t->u.kernel.target->me);
                return ret;
-
+       }
        if (t->u.kernel.target->checkentry
            && !t->u.kernel.target->checkentry(table, NULL,
                                               t->u.kernel.target, t->data,