linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Sat, 08 Jan 2005 18:00:24 +0000
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/08 18:00:18

Modified files:
        include/asm-mips: bitops.h 

Log message:
        Fix int vs. long bugs breaking the non-ll/sc case on 64-bit.

diff -urN linux/include/asm-mips/bitops.h linux/include/asm-mips/bitops.h
--- linux/include/asm-mips/bitops.h     2004/10/12 01:45:51     1.55
+++ linux/include/asm-mips/bitops.h     2005/01/08 18:00:18     1.56
@@ -92,7 +92,7 @@
                __bi_flags;
 
                a += nr >> SZLONG_LOG;
-               mask = 1 << (nr & SZLONG_MASK);
+               mask = 1UL << (nr & SZLONG_MASK);
                __bi_local_irq_save(flags);
                *a |= mask;
                __bi_local_irq_restore(flags);
@@ -385,7 +385,7 @@
                __bi_flags;
 
                a += nr >> SZLONG_LOG;
-               mask = 1 << (nr & SZLONG_MASK);
+               mask = 1UL << (nr & SZLONG_MASK);
                __bi_local_irq_save(flags);
                retval = (mask & *a) != 0;
                *a &= ~mask;

<Prev in Thread] Current Thread [Next in Thread>