diff for duplicates of <20060202125007.GA5918@miraclelinux.com> diff --git a/a/1.txt b/N1/1.txt index 584447f..618bad0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,8 @@ On Wed, Feb 01, 2006 at 11:24:27AM +0100, Andi Kleen wrote: This patch will put hweight*() into lib/hweight.c Index: 2.6-git/include/asm-generic/bitops/hweight.h -=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +=================================================================== +--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +++ 2.6-git/include/asm-generic/bitops/hweight.h @@ -1,54 +1,9 @@ #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_ @@ -63,9 +64,9 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h - -static inline unsigned long hweight64(__u64 w) -{ --#if BITS_PER_LONG = 32 +-#if BITS_PER_LONG == 32 - return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); --#elif BITS_PER_LONG = 64 +-#elif BITS_PER_LONG == 64 - u64 res; - res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); - res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); @@ -84,7 +85,8 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */ Index: 2.6-git/lib/Makefile -=================================--- 2.6-git.orig/lib/Makefile +=================================================================== +--- 2.6-git.orig/lib/Makefile +++ 2.6-git/lib/Makefile @@ -5,7 +5,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ @@ -96,7 +98,8 @@ Index: 2.6-git/lib/Makefile lib-y += kobject.o kref.o kobject_uevent.o klist.o Index: 2.6-git/lib/hweight.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ 2.6-git/lib/hweight.c @@ -0,0 +1,54 @@ +#include <linux/module.h> @@ -138,9 +141,9 @@ Index: 2.6-git/lib/hweight.c + +unsigned long hweight64(__u64 w) +{ -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + u64 res; + res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); + res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); diff --git a/a/content_digest b/N1/content_digest index 99f73f3..8c7721a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0200602011124.29423.ak@suse.de\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0Re: [patch 14/44] generic hweight{64,32,16,8}()\0" - "Date\0Thu, 02 Feb 2006 12:50:07 +0000\0" + "Date\0Thu, 2 Feb 2006 21:50:07 +0900\0" "To\0Andi Kleen <ak@suse.de>\0" "Cc\0Michael Tokarev <mjt@tls.msk.ru>" linux-kernel@vger.kernel.org @@ -18,7 +18,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 @@ -56,7 +56,8 @@ "This patch will put hweight*() into lib/hweight.c\n" "\n" "Index: 2.6-git/include/asm-generic/bitops/hweight.h\n" - "=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" "+++ 2.6-git/include/asm-generic/bitops/hweight.h\n" "@@ -1,54 +1,9 @@\n" " #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_\n" @@ -97,9 +98,9 @@ "-\n" "-static inline unsigned long hweight64(__u64 w)\n" "-{\n" - "-#if BITS_PER_LONG = 32\n" + "-#if BITS_PER_LONG == 32\n" "-\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "-#elif BITS_PER_LONG = 64\n" + "-#elif BITS_PER_LONG == 64\n" "-\tu64 res;\n" "-\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "-\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -118,7 +119,8 @@ " \n" " #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */\n" "Index: 2.6-git/lib/Makefile\n" - "=================================--- 2.6-git.orig/lib/Makefile\n" + "===================================================================\n" + "--- 2.6-git.orig/lib/Makefile\n" "+++ 2.6-git/lib/Makefile\n" "@@ -5,7 +5,7 @@\n" " lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \\\n" @@ -130,7 +132,8 @@ " lib-y\t+= kobject.o kref.o kobject_uevent.o klist.o\n" " \n" "Index: 2.6-git/lib/hweight.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ 2.6-git/lib/hweight.c\n" "@@ -0,0 +1,54 @@\n" "+#include <linux/module.h>\n" @@ -172,9 +175,9 @@ "+\n" "+unsigned long hweight64(__u64 w)\n" "+{\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\tu64 res;\n" "+\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "+\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -188,4 +191,4 @@ "+}\n" +EXPORT_SYMBOL(hweight64); -bbde1374609396efda927b9ffc5e4c97d92bd449ed087d5abf2c6017ba619666 +9078b5031c2a69e03202247bb90f589795892869ac62676908fb8a5bd5b6f0ef
diff --git a/a/1.txt b/N2/1.txt index 584447f..618bad0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,7 +22,8 @@ On Wed, Feb 01, 2006 at 11:24:27AM +0100, Andi Kleen wrote: This patch will put hweight*() into lib/hweight.c Index: 2.6-git/include/asm-generic/bitops/hweight.h -=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +=================================================================== +--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +++ 2.6-git/include/asm-generic/bitops/hweight.h @@ -1,54 +1,9 @@ #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_ @@ -63,9 +64,9 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h - -static inline unsigned long hweight64(__u64 w) -{ --#if BITS_PER_LONG = 32 +-#if BITS_PER_LONG == 32 - return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); --#elif BITS_PER_LONG = 64 +-#elif BITS_PER_LONG == 64 - u64 res; - res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); - res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); @@ -84,7 +85,8 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */ Index: 2.6-git/lib/Makefile -=================================--- 2.6-git.orig/lib/Makefile +=================================================================== +--- 2.6-git.orig/lib/Makefile +++ 2.6-git/lib/Makefile @@ -5,7 +5,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ @@ -96,7 +98,8 @@ Index: 2.6-git/lib/Makefile lib-y += kobject.o kref.o kobject_uevent.o klist.o Index: 2.6-git/lib/hweight.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ 2.6-git/lib/hweight.c @@ -0,0 +1,54 @@ +#include <linux/module.h> @@ -138,9 +141,9 @@ Index: 2.6-git/lib/hweight.c + +unsigned long hweight64(__u64 w) +{ -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + u64 res; + res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); + res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); diff --git a/a/content_digest b/N2/content_digest index 99f73f3..067e156 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,32 +4,32 @@ "ref\0200602011124.29423.ak@suse.de\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0Re: [patch 14/44] generic hweight{64,32,16,8}()\0" - "Date\0Thu, 02 Feb 2006 12:50:07 +0000\0" + "Date\0Thu, 2 Feb 2006 21:50:07 +0900\0" "To\0Andi Kleen <ak@suse.de>\0" - "Cc\0Michael Tokarev <mjt@tls.msk.ru>" - linux-kernel@vger.kernel.org - Richard 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 + Michael Tokarev <mjt@tls.msk.ru> David Howells <dhowells@redhat.com> + linuxppc-dev@ozlabs.org + Greg Ungerer <gerg@uclinux.org> + sparclinux@vger.kernel.org + Miles Bader <uclinux-v850@lsi.nec.co.jp> Yoshinori Sato <ysato@users.sourceforge.jp> - Linus Torvalds <torvalds@osdl.org> - linux-ia64@vger.kernel.org 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 + Linus Torvalds <torvalds@osdl.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> - " Chris Zankel <chris@zankel.net>\0" + linux-m68k@lists.linux-m68k.org + linux-kernel@vger.kernel.org + linuxsh-shmedia-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" "On Wed, Feb 01, 2006 at 11:24:27AM +0100, Andi Kleen wrote:\n" @@ -56,7 +56,8 @@ "This patch will put hweight*() into lib/hweight.c\n" "\n" "Index: 2.6-git/include/asm-generic/bitops/hweight.h\n" - "=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" "+++ 2.6-git/include/asm-generic/bitops/hweight.h\n" "@@ -1,54 +1,9 @@\n" " #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_\n" @@ -97,9 +98,9 @@ "-\n" "-static inline unsigned long hweight64(__u64 w)\n" "-{\n" - "-#if BITS_PER_LONG = 32\n" + "-#if BITS_PER_LONG == 32\n" "-\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "-#elif BITS_PER_LONG = 64\n" + "-#elif BITS_PER_LONG == 64\n" "-\tu64 res;\n" "-\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "-\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -118,7 +119,8 @@ " \n" " #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */\n" "Index: 2.6-git/lib/Makefile\n" - "=================================--- 2.6-git.orig/lib/Makefile\n" + "===================================================================\n" + "--- 2.6-git.orig/lib/Makefile\n" "+++ 2.6-git/lib/Makefile\n" "@@ -5,7 +5,7 @@\n" " lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \\\n" @@ -130,7 +132,8 @@ " lib-y\t+= kobject.o kref.o kobject_uevent.o klist.o\n" " \n" "Index: 2.6-git/lib/hweight.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ 2.6-git/lib/hweight.c\n" "@@ -0,0 +1,54 @@\n" "+#include <linux/module.h>\n" @@ -172,9 +175,9 @@ "+\n" "+unsigned long hweight64(__u64 w)\n" "+{\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\tu64 res;\n" "+\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "+\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -188,4 +191,4 @@ "+}\n" +EXPORT_SYMBOL(hweight64); -bbde1374609396efda927b9ffc5e4c97d92bd449ed087d5abf2c6017ba619666 +a00196182a8151f007ecebf8d7a3246e94b5790ac2b39b45562eb717a2f2ab12
diff --git a/a/content_digest b/N3/content_digest index 99f73f3..43d71a0 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -18,7 +18,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 @@ -188,4 +188,4 @@ "+}\n" +EXPORT_SYMBOL(hweight64); -bbde1374609396efda927b9ffc5e4c97d92bd449ed087d5abf2c6017ba619666 +a2d5feafd3cf7e39b36b271db82e705c80946c8132b8ec48bff16e4fcf2733bc
diff --git a/a/1.txt b/N4/1.txt index 584447f..618bad0 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -22,7 +22,8 @@ On Wed, Feb 01, 2006 at 11:24:27AM +0100, Andi Kleen wrote: This patch will put hweight*() into lib/hweight.c Index: 2.6-git/include/asm-generic/bitops/hweight.h -=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +=================================================================== +--- 2.6-git.orig/include/asm-generic/bitops/hweight.h +++ 2.6-git/include/asm-generic/bitops/hweight.h @@ -1,54 +1,9 @@ #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_ @@ -63,9 +64,9 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h - -static inline unsigned long hweight64(__u64 w) -{ --#if BITS_PER_LONG = 32 +-#if BITS_PER_LONG == 32 - return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); --#elif BITS_PER_LONG = 64 +-#elif BITS_PER_LONG == 64 - u64 res; - res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); - res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); @@ -84,7 +85,8 @@ Index: 2.6-git/include/asm-generic/bitops/hweight.h #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */ Index: 2.6-git/lib/Makefile -=================================--- 2.6-git.orig/lib/Makefile +=================================================================== +--- 2.6-git.orig/lib/Makefile +++ 2.6-git/lib/Makefile @@ -5,7 +5,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ @@ -96,7 +98,8 @@ Index: 2.6-git/lib/Makefile lib-y += kobject.o kref.o kobject_uevent.o klist.o Index: 2.6-git/lib/hweight.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ 2.6-git/lib/hweight.c @@ -0,0 +1,54 @@ +#include <linux/module.h> @@ -138,9 +141,9 @@ Index: 2.6-git/lib/hweight.c + +unsigned long hweight64(__u64 w) +{ -+#if BITS_PER_LONG = 32 ++#if BITS_PER_LONG == 32 + return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w); -+#elif BITS_PER_LONG = 64 ++#elif BITS_PER_LONG == 64 + u64 res; + res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul); + res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul); diff --git a/a/content_digest b/N4/content_digest index 99f73f3..8a4fa65 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -4,7 +4,7 @@ "ref\0200602011124.29423.ak@suse.de\0" "From\0mita@miraclelinux.com (Akinobu Mita)\0" "Subject\0Re: [patch 14/44] generic hweight{64,32,16,8}()\0" - "Date\0Thu, 02 Feb 2006 12:50:07 +0000\0" + "Date\0Thu, 2 Feb 2006 21:50:07 +0900\0" "To\0Andi Kleen <ak@suse.de>\0" "Cc\0Michael Tokarev <mjt@tls.msk.ru>" linux-kernel@vger.kernel.org @@ -56,7 +56,8 @@ "This patch will put hweight*() into lib/hweight.c\n" "\n" "Index: 2.6-git/include/asm-generic/bitops/hweight.h\n" - "=================================--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" + "===================================================================\n" + "--- 2.6-git.orig/include/asm-generic/bitops/hweight.h\n" "+++ 2.6-git/include/asm-generic/bitops/hweight.h\n" "@@ -1,54 +1,9 @@\n" " #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_\n" @@ -97,9 +98,9 @@ "-\n" "-static inline unsigned long hweight64(__u64 w)\n" "-{\n" - "-#if BITS_PER_LONG = 32\n" + "-#if BITS_PER_LONG == 32\n" "-\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "-#elif BITS_PER_LONG = 64\n" + "-#elif BITS_PER_LONG == 64\n" "-\tu64 res;\n" "-\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "-\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -118,7 +119,8 @@ " \n" " #endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */\n" "Index: 2.6-git/lib/Makefile\n" - "=================================--- 2.6-git.orig/lib/Makefile\n" + "===================================================================\n" + "--- 2.6-git.orig/lib/Makefile\n" "+++ 2.6-git/lib/Makefile\n" "@@ -5,7 +5,7 @@\n" " lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \\\n" @@ -130,7 +132,8 @@ " lib-y\t+= kobject.o kref.o kobject_uevent.o klist.o\n" " \n" "Index: 2.6-git/lib/hweight.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ 2.6-git/lib/hweight.c\n" "@@ -0,0 +1,54 @@\n" "+#include <linux/module.h>\n" @@ -172,9 +175,9 @@ "+\n" "+unsigned long hweight64(__u64 w)\n" "+{\n" - "+#if BITS_PER_LONG = 32\n" + "+#if BITS_PER_LONG == 32\n" "+\treturn hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);\n" - "+#elif BITS_PER_LONG = 64\n" + "+#elif BITS_PER_LONG == 64\n" "+\tu64 res;\n" "+\tres = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);\n" "+\tres = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);\n" @@ -188,4 +191,4 @@ "+}\n" +EXPORT_SYMBOL(hweight64); -bbde1374609396efda927b9ffc5e4c97d92bd449ed087d5abf2c6017ba619666 +5f2515088acaf55d3cbdec788d995910db35e25ea120a59cf7173ac0ea3210d5
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.