diff for duplicates of <20060201090334.521495000@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 23c4a1c..3931604 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 4 files changed, 15 insertions(+), 340 deletions(-) Index: 2.6-git/include/asm-sparc64/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sparc64/bitops.h +++ 2.6-git/include/asm-sparc64/bitops.h @@ -18,58 +18,7 @@ extern void set_bit(unsigned long nr, vo extern void clear_bit(unsigned long nr, volatile unsigned long *addr); @@ -280,7 +281,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h #endif /* __KERNEL__ */ Index: 2.6-git/arch/sparc64/kernel/sparc64_ksyms.c -=================================--- 2.6-git.orig/arch/sparc64/kernel/sparc64_ksyms.c +=================================================================== +--- 2.6-git.orig/arch/sparc64/kernel/sparc64_ksyms.c +++ 2.6-git/arch/sparc64/kernel/sparc64_ksyms.c @@ -170,11 +170,6 @@ EXPORT_SYMBOL(set_bit); EXPORT_SYMBOL(clear_bit); @@ -295,7 +297,8 @@ Index: 2.6-git/arch/sparc64/kernel/sparc64_ksyms.c EXPORT_SYMBOL(enable_irq); EXPORT_SYMBOL(disable_irq); Index: 2.6-git/arch/sparc64/lib/Makefile -=================================--- 2.6-git.orig/arch/sparc64/lib/Makefile +=================================================================== +--- 2.6-git.orig/arch/sparc64/lib/Makefile +++ 2.6-git/arch/sparc64/lib/Makefile @@ -12,6 +12,6 @@ lib-y := PeeCeeI.o copy_page.o clear_pag U1memcpy.o U1copy_from_user.o U1copy_to_user.o \ @@ -306,7 +309,8 @@ Index: 2.6-git/arch/sparc64/lib/Makefile obj-y += iomap.o Index: 2.6-git/arch/sparc64/lib/find_bit.c -=================================--- 2.6-git.orig/arch/sparc64/lib/find_bit.c +=================================================================== +--- 2.6-git.orig/arch/sparc64/lib/find_bit.c +++ /dev/null @@ -1,127 +0,0 @@ -#include <linux/bitops.h> @@ -350,7 +354,7 @@ Index: 2.6-git/arch/sparc64/lib/find_bit.c - -found_first: - tmp &= (~0UL >> (64 - 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); @@ -394,7 +398,7 @@ Index: 2.6-git/arch/sparc64/lib/find_bit.c - -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); @@ -431,7 +435,7 @@ Index: 2.6-git/arch/sparc64/lib/find_bit.c - tmp = __swab64p(p); -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); diff --git a/a/content_digest b/N1/content_digest index 3aa9b63..0157bdb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,12 @@ "ref\020060201090224.536581000@localhost.localdomain\0" "From\0Akinobu Mita <mita@miraclelinux.com>\0" "Subject\0[patch 36/44] sparc64: use generic bitops\0" - "Date\0Wed, 01 Feb 2006 09:03:00 +0000\0" + "Date\0Wed, 01 Feb 2006 18:03:00 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0ultralinux@vger.kernel.org" " Akinobu Mita <mita@miraclelinux.com>\0" "\00:1\0" + "fn\0sparc64.patch\0" "b\0" "- remove __{,test_and_}{set,clear,change}_bit() and test_bit()\n" "- remove ffz()\n" @@ -31,7 +32,8 @@ " 4 files changed, 15 insertions(+), 340 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-sparc64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc64/bitops.h\n" "+++ 2.6-git/include/asm-sparc64/bitops.h\n" "@@ -18,58 +18,7 @@ extern void set_bit(unsigned long nr, vo\n" " extern void clear_bit(unsigned long nr, volatile unsigned long *addr);\n" @@ -289,7 +291,8 @@ " #endif /* __KERNEL__ */\n" " \n" "Index: 2.6-git/arch/sparc64/kernel/sparc64_ksyms.c\n" - "=================================--- 2.6-git.orig/arch/sparc64/kernel/sparc64_ksyms.c\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/sparc64/kernel/sparc64_ksyms.c\n" "+++ 2.6-git/arch/sparc64/kernel/sparc64_ksyms.c\n" "@@ -170,11 +170,6 @@ EXPORT_SYMBOL(set_bit);\n" " EXPORT_SYMBOL(clear_bit);\n" @@ -304,7 +307,8 @@ " EXPORT_SYMBOL(enable_irq);\n" " EXPORT_SYMBOL(disable_irq);\n" "Index: 2.6-git/arch/sparc64/lib/Makefile\n" - "=================================--- 2.6-git.orig/arch/sparc64/lib/Makefile\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/sparc64/lib/Makefile\n" "+++ 2.6-git/arch/sparc64/lib/Makefile\n" "@@ -12,6 +12,6 @@ lib-y := PeeCeeI.o copy_page.o clear_pag\n" " \t U1memcpy.o U1copy_from_user.o U1copy_to_user.o \\\n" @@ -315,7 +319,8 @@ " \n" " obj-y += iomap.o\n" "Index: 2.6-git/arch/sparc64/lib/find_bit.c\n" - "=================================--- 2.6-git.orig/arch/sparc64/lib/find_bit.c\n" + "===================================================================\n" + "--- 2.6-git.orig/arch/sparc64/lib/find_bit.c\n" "+++ /dev/null\n" "@@ -1,127 +0,0 @@\n" "-#include <linux/bitops.h>\n" @@ -359,7 +364,7 @@ "-\n" "-found_first:\n" "-\ttmp &= (~0UL >> (64 - size));\n" - "-\tif (tmp = 0UL) /* Are any bits set? */\n" + "-\tif (tmp == 0UL) /* Are any bits set? */\n" "-\t\treturn result + size; /* Nope. */\n" "-found_middle:\n" "-\treturn result + __ffs(tmp);\n" @@ -403,7 +408,7 @@ "-\n" "-found_first:\n" "-\ttmp |= ~0UL << size;\n" - "-\tif (tmp = ~0UL) /* Are any bits zero? */\n" + "-\tif (tmp == ~0UL) /* Are any bits zero? */\n" "-\t\treturn result + size; /* Nope. */\n" "-found_middle:\n" "-\treturn result + ffz(tmp);\n" @@ -440,7 +445,7 @@ "-\ttmp = __swab64p(p);\n" "-found_first:\n" "-\ttmp |= (~0UL << size);\n" - "-\tif (tmp = ~0UL) /* Are any bits zero? */\n" + "-\tif (tmp == ~0UL) /* Are any bits zero? */\n" "-\t\treturn result + size; /* Nope. */\n" "-found_middle:\n" "-\treturn result + ffz(tmp);\n" @@ -448,4 +453,4 @@ "\n" -- -7acdae5991027397b92948b5a31210a567db5c398a392872844a214434a07aa5 +e9457ce0585b77fe4b6a67cd54d291c1329280ddf30b078432960b4bffdba342
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.