diff for duplicates of <20060125113206.GD18584@miraclelinux.com> diff --git a/a/1.txt b/N1/1.txt index 91ae40c..2a1642a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -95,7 +95,7 @@ version of these functions. This code largely copied from: arch/powerpc/lib/bitops.c -== KERNEL +==== KERNEL o generic sched_find_first_bit() @@ -198,7 +198,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 1 files changed, 641 insertions(+), 36 deletions(-) Index: work/include/asm-generic/bitops.h -=================================--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +=================================================================== +--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +++ work/include/asm-generic/bitops.h 2006-01-25 19:32:48.000000000 +0900 @@ -1,81 +1,686 @@ #ifndef _ASM_GENERIC_BITOPS_H_ @@ -440,7 +441,7 @@ Index: work/include/asm-generic/bitops.h - addr += nr >> 5; - mask = 1 << (nr & 0x1f); - return ((mask & *addr) != 0); -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + s = 16; if (word << 16 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 24 != 0) s = 0; b += s; word >>= s; + s = 4; if (word << 28 != 0) s = 0; b += s; word >>= s; @@ -448,7 +449,7 @@ Index: work/include/asm-generic/bitops.h + s = 1; if (word << 31 != 0) s = 0; b += s; + + return b; -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + s = 32; if (word << 32 != 0) s = 0; b += s; word >>= s; + s = 16; if (word << 48 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 56 != 0) s = 0; b += s; word >>= s; @@ -563,7 +564,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp &= (~0UL >> (BITS_PER_LONG - size)); -+ if (tmp = 0UL) /* Are any bits set? */ ++ if (tmp == 0UL) /* Are any bits set? */ + return result + size; /* Nope. */ +found_middle: + return result + __ffs(tmp); @@ -606,7 +607,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ +found_middle: + return result + ffz(tmp); @@ -631,13 +632,13 @@ Index: work/include/asm-generic/bitops.h + */ +static inline int sched_find_first_bit(const unsigned long *b) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) + return __ffs(b[1]) + 64; + return __ffs(b[2]) + 128; -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) @@ -801,9 +802,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder does not support "unsigned long" type */ +static inline unsigned long ext2_swabp(const unsigned long * x) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64p((u64 *) x); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32p((u32 *) x); +#else +#error BITS_PER_LONG not defined @@ -813,9 +814,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder doesn't support "unsigned long" type */ +static inline unsigned long ext2_swab(const unsigned long y) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64((u64) y); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32((u32) y); +#else +#error BITS_PER_LONG not defined @@ -855,7 +856,7 @@ Index: work/include/asm-generic/bitops.h + tmp = ext2_swabp(p); +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. Skip ffz */ +found_middle: + return result + ffz(tmp); diff --git a/a/content_digest b/N1/content_digest index 39de757..c69f9a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 3/6] C-language equivalents of include/asm-*/bitops.h\0" - "Date\0Wed, 25 Jan 2006 11:32:06 +0000\0" + "Date\0Wed, 25 Jan 2006 20:32:06 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Richard Henderson <rth@twiddle.net>" Ivan Kokshaysky <ink@jurassic.park.msu.ru> @@ -13,7 +13,7 @@ Linus Torvalds <torvalds@osdl.org> linux-ia64@vger.kernel.org Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org + linux-m68k@lists.linux-m68k.org Greg Ungerer <gerg@uclinux.org> linux-mips@linux-mips.org parisc-linux@parisc-linux.org @@ -125,7 +125,7 @@ "This code largely copied from:\n" "arch/powerpc/lib/bitops.c\n" "\n" - "== KERNEL\n" + "==== KERNEL\n" "\n" "o generic sched_find_first_bit()\n" "\n" @@ -228,7 +228,8 @@ " 1 files changed, 641 insertions(+), 36 deletions(-)\n" "\n" "Index: work/include/asm-generic/bitops.h\n" - "=================================--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" + "===================================================================\n" + "--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" "+++ work/include/asm-generic/bitops.h\t2006-01-25 19:32:48.000000000 +0900\n" "@@ -1,81 +1,686 @@\n" " #ifndef _ASM_GENERIC_BITOPS_H_\n" @@ -470,7 +471,7 @@ "-\taddr += nr >> 5;\n" "-\tmask = 1 << (nr & 0x1f);\n" "-\treturn ((mask & *addr) != 0);\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\ts = 16; if (word << 16 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 24 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 4; if (word << 28 != 0) s = 0; b += s; word >>= s;\n" @@ -478,7 +479,7 @@ "+\ts = 1; if (word << 31 != 0) s = 0; b += s;\n" "+\n" "+\treturn b;\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\ts = 32; if (word << 32 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 16; if (word << 48 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 56 != 0) s = 0; b += s; word >>= s;\n" @@ -593,7 +594,7 @@ "+\n" "+found_first:\n" "+\ttmp &= (~0UL >> (BITS_PER_LONG - size));\n" - "+\tif (tmp = 0UL)\t\t/* Are any bits set? */\n" + "+\tif (tmp == 0UL)\t\t/* Are any bits set? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + __ffs(tmp);\n" @@ -636,7 +637,7 @@ "+\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -661,13 +662,13 @@ "+ */\n" "+static inline int sched_find_first_bit(const unsigned long *b)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" "+\t\treturn __ffs(b[1]) + 64;\n" "+\treturn __ffs(b[2]) + 128;\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" @@ -831,9 +832,9 @@ "+/* include/linux/byteorder does not support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swabp(const unsigned long * x)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64p((u64 *) x);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32p((u32 *) x);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -843,9 +844,9 @@ "+/* include/linux/byteorder doesn't support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swab(const unsigned long y)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64((u64) y);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32((u32) y);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -885,7 +886,7 @@ "+\ttmp = ext2_swabp(p);\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size; /* Nope. Skip ffz */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -953,4 +954,4 @@ " \n" #endif /* __KERNEL__ */ -e1b067cf0678da11de6e4a7dd18542be848732d6102b68db3996f2f652e7fcac +aaed0ee196924ac8fc105b27a268f9af1db4e03c4330ab73aa5fb5896b3f67b6
diff --git a/a/1.txt b/N2/1.txt index 91ae40c..2a1642a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -95,7 +95,7 @@ version of these functions. This code largely copied from: arch/powerpc/lib/bitops.c -== KERNEL +==== KERNEL o generic sched_find_first_bit() @@ -198,7 +198,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 1 files changed, 641 insertions(+), 36 deletions(-) Index: work/include/asm-generic/bitops.h -=================================--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +=================================================================== +--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +++ work/include/asm-generic/bitops.h 2006-01-25 19:32:48.000000000 +0900 @@ -1,81 +1,686 @@ #ifndef _ASM_GENERIC_BITOPS_H_ @@ -440,7 +441,7 @@ Index: work/include/asm-generic/bitops.h - addr += nr >> 5; - mask = 1 << (nr & 0x1f); - return ((mask & *addr) != 0); -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + s = 16; if (word << 16 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 24 != 0) s = 0; b += s; word >>= s; + s = 4; if (word << 28 != 0) s = 0; b += s; word >>= s; @@ -448,7 +449,7 @@ Index: work/include/asm-generic/bitops.h + s = 1; if (word << 31 != 0) s = 0; b += s; + + return b; -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + s = 32; if (word << 32 != 0) s = 0; b += s; word >>= s; + s = 16; if (word << 48 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 56 != 0) s = 0; b += s; word >>= s; @@ -563,7 +564,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp &= (~0UL >> (BITS_PER_LONG - size)); -+ if (tmp = 0UL) /* Are any bits set? */ ++ if (tmp == 0UL) /* Are any bits set? */ + return result + size; /* Nope. */ +found_middle: + return result + __ffs(tmp); @@ -606,7 +607,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ +found_middle: + return result + ffz(tmp); @@ -631,13 +632,13 @@ Index: work/include/asm-generic/bitops.h + */ +static inline int sched_find_first_bit(const unsigned long *b) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) + return __ffs(b[1]) + 64; + return __ffs(b[2]) + 128; -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) @@ -801,9 +802,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder does not support "unsigned long" type */ +static inline unsigned long ext2_swabp(const unsigned long * x) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64p((u64 *) x); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32p((u32 *) x); +#else +#error BITS_PER_LONG not defined @@ -813,9 +814,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder doesn't support "unsigned long" type */ +static inline unsigned long ext2_swab(const unsigned long y) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64((u64) y); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32((u32) y); +#else +#error BITS_PER_LONG not defined @@ -855,7 +856,7 @@ Index: work/include/asm-generic/bitops.h + tmp = ext2_swabp(p); +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. Skip ffz */ +found_middle: + return result + ffz(tmp); diff --git a/a/content_digest b/N2/content_digest index 39de757..0ec163c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,31 +1,31 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 3/6] C-language equivalents of include/asm-*/bitops.h\0" - "Date\0Wed, 25 Jan 2006 11:32:06 +0000\0" + "Date\0Wed, 25 Jan 2006 20:32:06 +0900\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Richard Henderson <rth@twiddle.net>" - Ivan Kokshaysky <ink@jurassic.park.msu.ru> - Russell King <rmk@arm.linux.org.uk> + "Cc\0linux-mips@linux-mips.org" + linux-ia64@vger.kernel.org Ian Molton <spyro@f2s.com> - dev-etrax@axis.com David Howells <dhowells@redhat.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + linuxppc-dev@ozlabs.org + Greg Ungerer <gerg@uclinux.org> + sparclinux@vger.kernel.org + Miles Bader <uclinux-v850@lsi.nec.co.jp> Linus Torvalds <torvalds@osdl.org> - linux-ia64@vger.kernel.org + Yoshinori Sato <ysato@users.sourceforge.jp> Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org - Greg Ungerer <gerg@uclinux.org> - linux-mips@linux-mips.org - parisc-linux@parisc-linux.org - linuxppc-dev@ozlabs.org - linux390@de.ibm.com - linuxsh-dev@lists.sourceforge.net linuxsh-shmedia-dev@lists.sourceforge.net - sparclinux@vger.kernel.org + linux-m68k@lists.linux-m68k.org + Ivan Kokshaysky <ink@jurassic.park.msu.ru> + Richard Henderson <rth@twiddle.net> + Chris Zankel <chris@zankel.net> + dev-etrax@axis.com ultralinux@vger.kernel.org - Miles Bader <uclinux-v850@lsi.nec.co.jp> Andi Kleen <ak@suse.de> - " Chris Zankel <chris@zankel.net>\0" + linuxsh-dev@lists.sourceforge.net + linux390@de.ibm.com + Russell King <rmk@arm.linux.org.uk> + " parisc-linux@parisc-linux.org\0" "\00:1\0" "b\0" "o generic {,test_and_}{set,clear,change}_bit() (atomic bitops)\n" @@ -125,7 +125,7 @@ "This code largely copied from:\n" "arch/powerpc/lib/bitops.c\n" "\n" - "== KERNEL\n" + "==== KERNEL\n" "\n" "o generic sched_find_first_bit()\n" "\n" @@ -228,7 +228,8 @@ " 1 files changed, 641 insertions(+), 36 deletions(-)\n" "\n" "Index: work/include/asm-generic/bitops.h\n" - "=================================--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" + "===================================================================\n" + "--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" "+++ work/include/asm-generic/bitops.h\t2006-01-25 19:32:48.000000000 +0900\n" "@@ -1,81 +1,686 @@\n" " #ifndef _ASM_GENERIC_BITOPS_H_\n" @@ -470,7 +471,7 @@ "-\taddr += nr >> 5;\n" "-\tmask = 1 << (nr & 0x1f);\n" "-\treturn ((mask & *addr) != 0);\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\ts = 16; if (word << 16 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 24 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 4; if (word << 28 != 0) s = 0; b += s; word >>= s;\n" @@ -478,7 +479,7 @@ "+\ts = 1; if (word << 31 != 0) s = 0; b += s;\n" "+\n" "+\treturn b;\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\ts = 32; if (word << 32 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 16; if (word << 48 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 56 != 0) s = 0; b += s; word >>= s;\n" @@ -593,7 +594,7 @@ "+\n" "+found_first:\n" "+\ttmp &= (~0UL >> (BITS_PER_LONG - size));\n" - "+\tif (tmp = 0UL)\t\t/* Are any bits set? */\n" + "+\tif (tmp == 0UL)\t\t/* Are any bits set? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + __ffs(tmp);\n" @@ -636,7 +637,7 @@ "+\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -661,13 +662,13 @@ "+ */\n" "+static inline int sched_find_first_bit(const unsigned long *b)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" "+\t\treturn __ffs(b[1]) + 64;\n" "+\treturn __ffs(b[2]) + 128;\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" @@ -831,9 +832,9 @@ "+/* include/linux/byteorder does not support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swabp(const unsigned long * x)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64p((u64 *) x);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32p((u32 *) x);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -843,9 +844,9 @@ "+/* include/linux/byteorder doesn't support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swab(const unsigned long y)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64((u64) y);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32((u32) y);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -885,7 +886,7 @@ "+\ttmp = ext2_swabp(p);\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size; /* Nope. Skip ffz */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -953,4 +954,4 @@ " \n" #endif /* __KERNEL__ */ -e1b067cf0678da11de6e4a7dd18542be848732d6102b68db3996f2f652e7fcac +7a72a758064054d249a9dfebf0ce7182de0681926d3268857e2e2b4189767f52
diff --git a/a/content_digest b/N3/content_digest index 39de757..a028982 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -13,7 +13,7 @@ Linus Torvalds <torvalds@osdl.org> linux-ia64@vger.kernel.org Hirokazu Takata <takata@linux-m32r.org> - linux-m68k@vger.kernel.org + linux-m68k@lists.linux-m68k.org Greg Ungerer <gerg@uclinux.org> linux-mips@linux-mips.org parisc-linux@parisc-linux.org @@ -953,4 +953,4 @@ " \n" #endif /* __KERNEL__ */ -e1b067cf0678da11de6e4a7dd18542be848732d6102b68db3996f2f652e7fcac +179b5e423730c39150034032766f3581e44ae592212125fc9707e560b2aa5b2e
diff --git a/a/1.txt b/N4/1.txt index 91ae40c..2a1642a 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -95,7 +95,7 @@ version of these functions. This code largely copied from: arch/powerpc/lib/bitops.c -== KERNEL +==== KERNEL o generic sched_find_first_bit() @@ -198,7 +198,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 1 files changed, 641 insertions(+), 36 deletions(-) Index: work/include/asm-generic/bitops.h -=================================--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +=================================================================== +--- work.orig/include/asm-generic/bitops.h 2006-01-25 19:14:27.000000000 +0900 +++ work/include/asm-generic/bitops.h 2006-01-25 19:32:48.000000000 +0900 @@ -1,81 +1,686 @@ #ifndef _ASM_GENERIC_BITOPS_H_ @@ -440,7 +441,7 @@ Index: work/include/asm-generic/bitops.h - addr += nr >> 5; - mask = 1 << (nr & 0x1f); - return ((mask & *addr) != 0); -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + s = 16; if (word << 16 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 24 != 0) s = 0; b += s; word >>= s; + s = 4; if (word << 28 != 0) s = 0; b += s; word >>= s; @@ -448,7 +449,7 @@ Index: work/include/asm-generic/bitops.h + s = 1; if (word << 31 != 0) s = 0; b += s; + + return b; -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + s = 32; if (word << 32 != 0) s = 0; b += s; word >>= s; + s = 16; if (word << 48 != 0) s = 0; b += s; word >>= s; + s = 8; if (word << 56 != 0) s = 0; b += s; word >>= s; @@ -563,7 +564,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp &= (~0UL >> (BITS_PER_LONG - size)); -+ if (tmp = 0UL) /* Are any bits set? */ ++ if (tmp == 0UL) /* Are any bits set? */ + return result + size; /* Nope. */ +found_middle: + return result + __ffs(tmp); @@ -606,7 +607,7 @@ Index: work/include/asm-generic/bitops.h + +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ +found_middle: + return result + ffz(tmp); @@ -631,13 +632,13 @@ Index: work/include/asm-generic/bitops.h + */ +static inline int sched_find_first_bit(const unsigned long *b) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) + return __ffs(b[1]) + 64; + return __ffs(b[2]) + 128; -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + if (unlikely(b[0])) + return __ffs(b[0]); + if (unlikely(b[1])) @@ -801,9 +802,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder does not support "unsigned long" type */ +static inline unsigned long ext2_swabp(const unsigned long * x) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64p((u64 *) x); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32p((u32 *) x); +#else +#error BITS_PER_LONG not defined @@ -813,9 +814,9 @@ Index: work/include/asm-generic/bitops.h +/* include/linux/byteorder doesn't support "unsigned long" type */ +static inline unsigned long ext2_swab(const unsigned long y) +{ -+#if BITS_PER_LONG = 64 ++#if BITS_PER_LONG == 64 + return (unsigned long) __swab64((u64) y); -+#elif BITS_PER_LONG = 32 ++#elif BITS_PER_LONG == 32 + return (unsigned long) __swab32((u32) y); +#else +#error BITS_PER_LONG not defined @@ -855,7 +856,7 @@ Index: work/include/asm-generic/bitops.h + tmp = ext2_swabp(p); +found_first: + tmp |= ~0UL << size; -+ if (tmp = ~0UL) /* Are any bits zero? */ ++ if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. Skip ffz */ +found_middle: + return result + ffz(tmp); diff --git a/a/content_digest b/N4/content_digest index 39de757..0fb22fe 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\020060125112625.GA18584@miraclelinux.com\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0[PATCH 3/6] C-language equivalents of include/asm-*/bitops.h\0" - "Date\0Wed, 25 Jan 2006 11:32:06 +0000\0" + "Date\0Wed, 25 Jan 2006 20:32:06 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Richard Henderson <rth@twiddle.net>" Ivan Kokshaysky <ink@jurassic.park.msu.ru> @@ -125,7 +125,7 @@ "This code largely copied from:\n" "arch/powerpc/lib/bitops.c\n" "\n" - "== KERNEL\n" + "==== KERNEL\n" "\n" "o generic sched_find_first_bit()\n" "\n" @@ -228,7 +228,8 @@ " 1 files changed, 641 insertions(+), 36 deletions(-)\n" "\n" "Index: work/include/asm-generic/bitops.h\n" - "=================================--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" + "===================================================================\n" + "--- work.orig/include/asm-generic/bitops.h\t2006-01-25 19:14:27.000000000 +0900\n" "+++ work/include/asm-generic/bitops.h\t2006-01-25 19:32:48.000000000 +0900\n" "@@ -1,81 +1,686 @@\n" " #ifndef _ASM_GENERIC_BITOPS_H_\n" @@ -470,7 +471,7 @@ "-\taddr += nr >> 5;\n" "-\tmask = 1 << (nr & 0x1f);\n" "-\treturn ((mask & *addr) != 0);\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\ts = 16; if (word << 16 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 24 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 4; if (word << 28 != 0) s = 0; b += s; word >>= s;\n" @@ -478,7 +479,7 @@ "+\ts = 1; if (word << 31 != 0) s = 0; b += s;\n" "+\n" "+\treturn b;\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\ts = 32; if (word << 32 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 16; if (word << 48 != 0) s = 0; b += s; word >>= s;\n" "+\ts = 8; if (word << 56 != 0) s = 0; b += s; word >>= s;\n" @@ -593,7 +594,7 @@ "+\n" "+found_first:\n" "+\ttmp &= (~0UL >> (BITS_PER_LONG - size));\n" - "+\tif (tmp = 0UL)\t\t/* Are any bits set? */\n" + "+\tif (tmp == 0UL)\t\t/* Are any bits set? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + __ffs(tmp);\n" @@ -636,7 +637,7 @@ "+\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size;\t/* Nope. */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -661,13 +662,13 @@ "+ */\n" "+static inline int sched_find_first_bit(const unsigned long *b)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" "+\t\treturn __ffs(b[1]) + 64;\n" "+\treturn __ffs(b[2]) + 128;\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\tif (unlikely(b[0]))\n" "+\t\treturn __ffs(b[0]);\n" "+\tif (unlikely(b[1]))\n" @@ -831,9 +832,9 @@ "+/* include/linux/byteorder does not support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swabp(const unsigned long * x)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64p((u64 *) x);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32p((u32 *) x);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -843,9 +844,9 @@ "+/* include/linux/byteorder doesn't support \"unsigned long\" type */\n" "+static inline unsigned long ext2_swab(const unsigned long y)\n" "+{\n" - "+#if BITS_PER_LONG = 64\n" + "+#if BITS_PER_LONG == 64\n" "+\treturn (unsigned long) __swab64((u64) y);\n" - "+#elif BITS_PER_LONG = 32\n" + "+#elif BITS_PER_LONG == 32\n" "+\treturn (unsigned long) __swab32((u32) y);\n" "+#else\n" "+#error BITS_PER_LONG not defined\n" @@ -885,7 +886,7 @@ "+\ttmp = ext2_swabp(p);\n" "+found_first:\n" "+\ttmp |= ~0UL << size;\n" - "+\tif (tmp = ~0UL)\t/* Are any bits zero? */\n" + "+\tif (tmp == ~0UL)\t/* Are any bits zero? */\n" "+\t\treturn result + size; /* Nope. Skip ffz */\n" "+found_middle:\n" "+\treturn result + ffz(tmp);\n" @@ -953,4 +954,4 @@ " \n" #endif /* __KERNEL__ */ -e1b067cf0678da11de6e4a7dd18542be848732d6102b68db3996f2f652e7fcac +c3e50e910ec8999ba3abe8de397be7e449a3abd3e68695563a2fcc1da6c2181d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.