diff for duplicates of <20060201090322.062243000@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 226c080..e2975a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 15 files changed, 60 insertions(+), 72 deletions(-) Index: 2.6-git/include/asm-h8300/bitops.h -=================================--- 2.6-git.orig/include/asm-h8300/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-h8300/bitops.h +++ 2.6-git/include/asm-h8300/bitops.h @@ -397,9 +397,9 @@ found_middle: } @@ -44,7 +45,8 @@ Index: 2.6-git/include/asm-h8300/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h +++ 2.6-git/include/asm-ia64/bitops.h @@ -394,18 +394,18 @@ extern int __find_next_bit(const void *a @@ -71,7 +73,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-mips/bitops.h -=================================--- 2.6-git.orig/include/asm-mips/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-mips/bitops.h +++ 2.6-git/include/asm-mips/bitops.h @@ -956,9 +956,9 @@ found_middle: * FIXME: These assume that Minix uses the native byte/bitorder. @@ -87,7 +90,8 @@ Index: 2.6-git/include/asm-mips/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-s390/bitops.h -=================================--- 2.6-git.orig/include/asm-s390/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-s390/bitops.h +++ 2.6-git/include/asm-s390/bitops.h @@ -871,11 +871,11 @@ static inline int sched_find_first_bit(u */ @@ -119,7 +123,8 @@ Index: 2.6-git/include/asm-s390/bitops.h test_bit(nr,(unsigned long *)addr) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sh/bitops.h -=================================--- 2.6-git.orig/include/asm-sh/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sh/bitops.h +++ 2.6-git/include/asm-sh/bitops.h @@ -339,8 +339,8 @@ static inline int sched_find_first_bit(c } @@ -177,7 +182,8 @@ Index: 2.6-git/include/asm-sh/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sh64/bitops.h -=================================--- 2.6-git.orig/include/asm-sh64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sh64/bitops.h +++ 2.6-git/include/asm-sh64/bitops.h @@ -382,8 +382,8 @@ static inline int sched_find_first_bit(u #define hweight8(x) generic_hweight8(x) @@ -235,7 +241,8 @@ Index: 2.6-git/include/asm-sh64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sparc/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sparc/bitops.h +++ 2.6-git/include/asm-sparc/bitops.h @@ -523,11 +523,11 @@ found_middle: @@ -253,7 +260,8 @@ Index: 2.6-git/include/asm-sparc/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ 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 @@ -280,11 +280,11 @@ extern unsigned long find_next_zero_le_b @@ -271,7 +279,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-v850/bitops.h -=================================--- 2.6-git.orig/include/asm-v850/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-v850/bitops.h +++ 2.6-git/include/asm-v850/bitops.h @@ -336,18 +336,18 @@ static inline int sched_find_first_bit(u #define hweight16(x) generic_hweight16 (x) @@ -298,7 +307,8 @@ Index: 2.6-git/include/asm-v850/bitops.h #define minix_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-xtensa/bitops.h -=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-xtensa/bitops.h +++ 2.6-git/include/asm-xtensa/bitops.h @@ -436,9 +436,9 @@ static inline int sched_find_first_bit(c @@ -314,7 +324,8 @@ Index: 2.6-git/include/asm-xtensa/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-m32r/bitops.h -=================================--- 2.6-git.orig/include/asm-m32r/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m32r/bitops.h +++ 2.6-git/include/asm-m32r/bitops.h @@ -575,7 +575,7 @@ found_middle: */ @@ -326,7 +337,8 @@ Index: 2.6-git/include/asm-m32r/bitops.h #define ext2_test_bit test_bit #define ext2_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-cris/bitops.h -=================================--- 2.6-git.orig/include/asm-cris/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-cris/bitops.h +++ 2.6-git/include/asm-cris/bitops.h @@ -352,17 +352,17 @@ found_middle: #define find_first_bit(addr, size) \ @@ -351,7 +363,8 @@ Index: 2.6-git/include/asm-cris/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-frv/bitops.h -=================================--- 2.6-git.orig/include/asm-frv/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-frv/bitops.h +++ 2.6-git/include/asm-frv/bitops.h @@ -259,11 +259,11 @@ static inline int sched_find_first_bit(c #define hweight16(x) generic_hweight16(x) @@ -383,7 +396,8 @@ Index: 2.6-git/include/asm-frv/bitops.h #define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-m68k/bitops.h -=================================--- 2.6-git.orig/include/asm-m68k/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m68k/bitops.h +++ 2.6-git/include/asm-m68k/bitops.h @@ -365,9 +365,9 @@ static inline int minix_find_first_zero_ return ((p - addr) << 4) + (res ^ 31); @@ -411,7 +425,8 @@ Index: 2.6-git/include/asm-m68k/bitops.h static inline int ext2_test_bit(int nr, const void *vaddr) Index: 2.6-git/include/asm-m68knommu/bitops.h -=================================--- 2.6-git.orig/include/asm-m68knommu/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m68knommu/bitops.h +++ 2.6-git/include/asm-m68knommu/bitops.h @@ -476,9 +476,9 @@ found_middle: } diff --git a/a/content_digest b/N1/content_digest index 96e5e79..3d3b4d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,14 @@ "ref\020060201090224.536581000@localhost.localdomain\0" "From\0Akinobu Mita <mita@miraclelinux.com>\0" "Subject\0[patch 04/44] use non atomic operations for minix_*_bit() and ext2_*_bit()\0" - "Date\0Wed, 01 Feb 2006 09:02:28 +0000\0" + "Date\0Wed, 01 Feb 2006 18:02:28 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0dev-etrax@axis.com" David Howells <dhowells@redhat.com> Yoshinori Sato <ysato@users.sourceforge.jp> 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 linux390@de.ibm.com @@ -20,6 +20,7 @@ Chris Zankel <chris@zankel.net> " Akinobu Mita <mita@miraclelinux.com>\0" "\00:1\0" + "fn\0use-non-atomic.patch\0" "b\0" "Bitmap functions for the minix filesystem and the ext2 filesystem do not\n" "require the atomic guarantees except ext2_set_bit_atomic() and\n" @@ -51,7 +52,8 @@ " 15 files changed, 60 insertions(+), 72 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-h8300/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-h8300/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-h8300/bitops.h\n" "+++ 2.6-git/include/asm-h8300/bitops.h\n" "@@ -397,9 +397,9 @@ found_middle:\n" " }\n" @@ -67,7 +69,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\n" "+++ 2.6-git/include/asm-ia64/bitops.h\n" "@@ -394,18 +394,18 @@ extern int __find_next_bit(const void *a\n" " \n" @@ -94,7 +97,8 @@ " #define minix_find_first_zero_bit(addr,size)\tfind_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-mips/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-mips/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-mips/bitops.h\n" "+++ 2.6-git/include/asm-mips/bitops.h\n" "@@ -956,9 +956,9 @@ found_middle:\n" " * FIXME: These assume that Minix uses the native byte/bitorder.\n" @@ -110,7 +114,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-s390/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-s390/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-s390/bitops.h\n" "+++ 2.6-git/include/asm-s390/bitops.h\n" "@@ -871,11 +871,11 @@ static inline int sched_find_first_bit(u\n" " */\n" @@ -142,7 +147,8 @@ " \ttest_bit(nr,(unsigned long *)addr)\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sh/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh/bitops.h\n" "+++ 2.6-git/include/asm-sh/bitops.h\n" "@@ -339,8 +339,8 @@ static inline int sched_find_first_bit(c\n" " }\n" @@ -200,7 +206,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sh64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh64/bitops.h\n" "+++ 2.6-git/include/asm-sh64/bitops.h\n" "@@ -382,8 +382,8 @@ static inline int sched_find_first_bit(u\n" " #define hweight8(x) generic_hweight8(x)\n" @@ -258,7 +265,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sparc/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc/bitops.h\n" "+++ 2.6-git/include/asm-sparc/bitops.h\n" "@@ -523,11 +523,11 @@ found_middle:\n" " \n" @@ -276,7 +284,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\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" "@@ -280,11 +280,11 @@ extern unsigned long find_next_zero_le_b\n" " \n" @@ -294,7 +303,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-v850/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-v850/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-v850/bitops.h\n" "+++ 2.6-git/include/asm-v850/bitops.h\n" "@@ -336,18 +336,18 @@ static inline int sched_find_first_bit(u\n" " #define hweight16(x) \t\t\tgeneric_hweight16 (x)\n" @@ -321,7 +331,8 @@ " #define minix_find_first_zero_bit \tfind_first_zero_bit\n" " \n" "Index: 2.6-git/include/asm-xtensa/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-xtensa/bitops.h\n" "+++ 2.6-git/include/asm-xtensa/bitops.h\n" "@@ -436,9 +436,9 @@ static inline int sched_find_first_bit(c\n" " \n" @@ -337,7 +348,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-m32r/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m32r/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m32r/bitops.h\n" "+++ 2.6-git/include/asm-m32r/bitops.h\n" "@@ -575,7 +575,7 @@ found_middle:\n" " */\n" @@ -349,7 +361,8 @@ " #define ext2_test_bit\t\t\ttest_bit\n" " #define ext2_find_first_zero_bit\tfind_first_zero_bit\n" "Index: 2.6-git/include/asm-cris/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-cris/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-cris/bitops.h\n" "+++ 2.6-git/include/asm-cris/bitops.h\n" "@@ -352,17 +352,17 @@ found_middle:\n" " #define find_first_bit(addr, size) \\\n" @@ -374,7 +387,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-frv/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-frv/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-frv/bitops.h\n" "+++ 2.6-git/include/asm-frv/bitops.h\n" "@@ -259,11 +259,11 @@ static inline int sched_find_first_bit(c\n" " #define hweight16(x) generic_hweight16(x)\n" @@ -406,7 +420,8 @@ " #define minix_find_first_zero_bit(addr,size)\text2_find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-m68k/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m68k/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m68k/bitops.h\n" "+++ 2.6-git/include/asm-m68k/bitops.h\n" "@@ -365,9 +365,9 @@ static inline int minix_find_first_zero_\n" " \treturn ((p - addr) << 4) + (res ^ 31);\n" @@ -434,7 +449,8 @@ " \n" " static inline int ext2_test_bit(int nr, const void *vaddr)\n" "Index: 2.6-git/include/asm-m68knommu/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m68knommu/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m68knommu/bitops.h\n" "+++ 2.6-git/include/asm-m68knommu/bitops.h\n" "@@ -476,9 +476,9 @@ found_middle:\n" " }\n" @@ -452,4 +468,4 @@ "\n" -- -a3edd9ca1cf514c67b5242c6f94b4f998ca98bc4a9ebf02552d36f1e5defb2a3 +460263092d33f8082de2ac30745b4986a58e5761dd9f88f7420cac498bfec875
diff --git a/a/content_digest b/N2/content_digest index 96e5e79..dc34203 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,7 +8,7 @@ Yoshinori Sato <ysato@users.sourceforge.jp> 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 linux390@de.ibm.com @@ -452,4 +452,4 @@ "\n" -- -a3edd9ca1cf514c67b5242c6f94b4f998ca98bc4a9ebf02552d36f1e5defb2a3 +44cd73d2264476bf75f1365b506db44bb52478f688137f3797fd9d44a7c5c33d
diff --git a/a/1.txt b/N3/1.txt index 226c080..e2975a2 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -28,7 +28,8 @@ Signed-off-by: Akinobu Mita <mita@miraclelinux.com> 15 files changed, 60 insertions(+), 72 deletions(-) Index: 2.6-git/include/asm-h8300/bitops.h -=================================--- 2.6-git.orig/include/asm-h8300/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-h8300/bitops.h +++ 2.6-git/include/asm-h8300/bitops.h @@ -397,9 +397,9 @@ found_middle: } @@ -44,7 +45,8 @@ Index: 2.6-git/include/asm-h8300/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-ia64/bitops.h -=================================--- 2.6-git.orig/include/asm-ia64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-ia64/bitops.h +++ 2.6-git/include/asm-ia64/bitops.h @@ -394,18 +394,18 @@ extern int __find_next_bit(const void *a @@ -71,7 +73,8 @@ Index: 2.6-git/include/asm-ia64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-mips/bitops.h -=================================--- 2.6-git.orig/include/asm-mips/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-mips/bitops.h +++ 2.6-git/include/asm-mips/bitops.h @@ -956,9 +956,9 @@ found_middle: * FIXME: These assume that Minix uses the native byte/bitorder. @@ -87,7 +90,8 @@ Index: 2.6-git/include/asm-mips/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-s390/bitops.h -=================================--- 2.6-git.orig/include/asm-s390/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-s390/bitops.h +++ 2.6-git/include/asm-s390/bitops.h @@ -871,11 +871,11 @@ static inline int sched_find_first_bit(u */ @@ -119,7 +123,8 @@ Index: 2.6-git/include/asm-s390/bitops.h test_bit(nr,(unsigned long *)addr) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-sh/bitops.h -=================================--- 2.6-git.orig/include/asm-sh/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sh/bitops.h +++ 2.6-git/include/asm-sh/bitops.h @@ -339,8 +339,8 @@ static inline int sched_find_first_bit(c } @@ -177,7 +182,8 @@ Index: 2.6-git/include/asm-sh/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sh64/bitops.h -=================================--- 2.6-git.orig/include/asm-sh64/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sh64/bitops.h +++ 2.6-git/include/asm-sh64/bitops.h @@ -382,8 +382,8 @@ static inline int sched_find_first_bit(u #define hweight8(x) generic_hweight8(x) @@ -235,7 +241,8 @@ Index: 2.6-git/include/asm-sh64/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-sparc/bitops.h -=================================--- 2.6-git.orig/include/asm-sparc/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-sparc/bitops.h +++ 2.6-git/include/asm-sparc/bitops.h @@ -523,11 +523,11 @@ found_middle: @@ -253,7 +260,8 @@ Index: 2.6-git/include/asm-sparc/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ 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 @@ -280,11 +280,11 @@ extern unsigned long find_next_zero_le_b @@ -271,7 +279,8 @@ Index: 2.6-git/include/asm-sparc64/bitops.h test_bit((nr),(unsigned long *)(addr)) #define minix_find_first_zero_bit(addr,size) \ Index: 2.6-git/include/asm-v850/bitops.h -=================================--- 2.6-git.orig/include/asm-v850/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-v850/bitops.h +++ 2.6-git/include/asm-v850/bitops.h @@ -336,18 +336,18 @@ static inline int sched_find_first_bit(u #define hweight16(x) generic_hweight16 (x) @@ -298,7 +307,8 @@ Index: 2.6-git/include/asm-v850/bitops.h #define minix_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-xtensa/bitops.h -=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-xtensa/bitops.h +++ 2.6-git/include/asm-xtensa/bitops.h @@ -436,9 +436,9 @@ static inline int sched_find_first_bit(c @@ -314,7 +324,8 @@ Index: 2.6-git/include/asm-xtensa/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-m32r/bitops.h -=================================--- 2.6-git.orig/include/asm-m32r/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m32r/bitops.h +++ 2.6-git/include/asm-m32r/bitops.h @@ -575,7 +575,7 @@ found_middle: */ @@ -326,7 +337,8 @@ Index: 2.6-git/include/asm-m32r/bitops.h #define ext2_test_bit test_bit #define ext2_find_first_zero_bit find_first_zero_bit Index: 2.6-git/include/asm-cris/bitops.h -=================================--- 2.6-git.orig/include/asm-cris/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-cris/bitops.h +++ 2.6-git/include/asm-cris/bitops.h @@ -352,17 +352,17 @@ found_middle: #define find_first_bit(addr, size) \ @@ -351,7 +363,8 @@ Index: 2.6-git/include/asm-cris/bitops.h #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-frv/bitops.h -=================================--- 2.6-git.orig/include/asm-frv/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-frv/bitops.h +++ 2.6-git/include/asm-frv/bitops.h @@ -259,11 +259,11 @@ static inline int sched_find_first_bit(c #define hweight16(x) generic_hweight16(x) @@ -383,7 +396,8 @@ Index: 2.6-git/include/asm-frv/bitops.h #define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size) Index: 2.6-git/include/asm-m68k/bitops.h -=================================--- 2.6-git.orig/include/asm-m68k/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m68k/bitops.h +++ 2.6-git/include/asm-m68k/bitops.h @@ -365,9 +365,9 @@ static inline int minix_find_first_zero_ return ((p - addr) << 4) + (res ^ 31); @@ -411,7 +425,8 @@ Index: 2.6-git/include/asm-m68k/bitops.h static inline int ext2_test_bit(int nr, const void *vaddr) Index: 2.6-git/include/asm-m68knommu/bitops.h -=================================--- 2.6-git.orig/include/asm-m68knommu/bitops.h +=================================================================== +--- 2.6-git.orig/include/asm-m68knommu/bitops.h +++ 2.6-git/include/asm-m68knommu/bitops.h @@ -476,9 +476,9 @@ found_middle: } diff --git a/a/content_digest b/N3/content_digest index 96e5e79..4ead97e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020060201090224.536581000@localhost.localdomain\0" "From\0Akinobu Mita <mita@miraclelinux.com>\0" "Subject\0[patch 04/44] use non atomic operations for minix_*_bit() and ext2_*_bit()\0" - "Date\0Wed, 01 Feb 2006 09:02:28 +0000\0" + "Date\0Wed, 01 Feb 2006 18:02:28 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0dev-etrax@axis.com" David Howells <dhowells@redhat.com> @@ -20,6 +20,7 @@ Chris Zankel <chris@zankel.net> " Akinobu Mita <mita@miraclelinux.com>\0" "\00:1\0" + "fn\0use-non-atomic.patch\0" "b\0" "Bitmap functions for the minix filesystem and the ext2 filesystem do not\n" "require the atomic guarantees except ext2_set_bit_atomic() and\n" @@ -51,7 +52,8 @@ " 15 files changed, 60 insertions(+), 72 deletions(-)\n" "\n" "Index: 2.6-git/include/asm-h8300/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-h8300/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-h8300/bitops.h\n" "+++ 2.6-git/include/asm-h8300/bitops.h\n" "@@ -397,9 +397,9 @@ found_middle:\n" " }\n" @@ -67,7 +69,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-ia64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-ia64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-ia64/bitops.h\n" "+++ 2.6-git/include/asm-ia64/bitops.h\n" "@@ -394,18 +394,18 @@ extern int __find_next_bit(const void *a\n" " \n" @@ -94,7 +97,8 @@ " #define minix_find_first_zero_bit(addr,size)\tfind_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-mips/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-mips/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-mips/bitops.h\n" "+++ 2.6-git/include/asm-mips/bitops.h\n" "@@ -956,9 +956,9 @@ found_middle:\n" " * FIXME: These assume that Minix uses the native byte/bitorder.\n" @@ -110,7 +114,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-s390/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-s390/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-s390/bitops.h\n" "+++ 2.6-git/include/asm-s390/bitops.h\n" "@@ -871,11 +871,11 @@ static inline int sched_find_first_bit(u\n" " */\n" @@ -142,7 +147,8 @@ " \ttest_bit(nr,(unsigned long *)addr)\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-sh/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh/bitops.h\n" "+++ 2.6-git/include/asm-sh/bitops.h\n" "@@ -339,8 +339,8 @@ static inline int sched_find_first_bit(c\n" " }\n" @@ -200,7 +206,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sh64/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sh64/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sh64/bitops.h\n" "+++ 2.6-git/include/asm-sh64/bitops.h\n" "@@ -382,8 +382,8 @@ static inline int sched_find_first_bit(u\n" " #define hweight8(x) generic_hweight8(x)\n" @@ -258,7 +265,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-sparc/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-sparc/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-sparc/bitops.h\n" "+++ 2.6-git/include/asm-sparc/bitops.h\n" "@@ -523,11 +523,11 @@ found_middle:\n" " \n" @@ -276,7 +284,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\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" "@@ -280,11 +280,11 @@ extern unsigned long find_next_zero_le_b\n" " \n" @@ -294,7 +303,8 @@ " \ttest_bit((nr),(unsigned long *)(addr))\n" " #define minix_find_first_zero_bit(addr,size) \\\n" "Index: 2.6-git/include/asm-v850/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-v850/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-v850/bitops.h\n" "+++ 2.6-git/include/asm-v850/bitops.h\n" "@@ -336,18 +336,18 @@ static inline int sched_find_first_bit(u\n" " #define hweight16(x) \t\t\tgeneric_hweight16 (x)\n" @@ -321,7 +331,8 @@ " #define minix_find_first_zero_bit \tfind_first_zero_bit\n" " \n" "Index: 2.6-git/include/asm-xtensa/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-xtensa/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-xtensa/bitops.h\n" "+++ 2.6-git/include/asm-xtensa/bitops.h\n" "@@ -436,9 +436,9 @@ static inline int sched_find_first_bit(c\n" " \n" @@ -337,7 +348,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-m32r/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m32r/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m32r/bitops.h\n" "+++ 2.6-git/include/asm-m32r/bitops.h\n" "@@ -575,7 +575,7 @@ found_middle:\n" " */\n" @@ -349,7 +361,8 @@ " #define ext2_test_bit\t\t\ttest_bit\n" " #define ext2_find_first_zero_bit\tfind_first_zero_bit\n" "Index: 2.6-git/include/asm-cris/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-cris/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-cris/bitops.h\n" "+++ 2.6-git/include/asm-cris/bitops.h\n" "@@ -352,17 +352,17 @@ found_middle:\n" " #define find_first_bit(addr, size) \\\n" @@ -374,7 +387,8 @@ " #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-frv/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-frv/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-frv/bitops.h\n" "+++ 2.6-git/include/asm-frv/bitops.h\n" "@@ -259,11 +259,11 @@ static inline int sched_find_first_bit(c\n" " #define hweight16(x) generic_hweight16(x)\n" @@ -406,7 +420,8 @@ " #define minix_find_first_zero_bit(addr,size)\text2_find_first_zero_bit(addr,size)\n" " \n" "Index: 2.6-git/include/asm-m68k/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m68k/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m68k/bitops.h\n" "+++ 2.6-git/include/asm-m68k/bitops.h\n" "@@ -365,9 +365,9 @@ static inline int minix_find_first_zero_\n" " \treturn ((p - addr) << 4) + (res ^ 31);\n" @@ -434,7 +449,8 @@ " \n" " static inline int ext2_test_bit(int nr, const void *vaddr)\n" "Index: 2.6-git/include/asm-m68knommu/bitops.h\n" - "=================================--- 2.6-git.orig/include/asm-m68knommu/bitops.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-m68knommu/bitops.h\n" "+++ 2.6-git/include/asm-m68knommu/bitops.h\n" "@@ -476,9 +476,9 @@ found_middle:\n" " }\n" @@ -452,4 +468,4 @@ "\n" -- -a3edd9ca1cf514c67b5242c6f94b4f998ca98bc4a9ebf02552d36f1e5defb2a3 +a31a80009742237eab857c40ac9a15d2d81e91fb6cb43cdd35c670ab41a04da6
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.