From: Akinobu Mita <mita@miraclelinux.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, linux390@de.ibm.com, Akinobu Mita <mita@miraclelinux.com>
Subject: [patch 33/47] s390: use generic bitops
Date: Tue, 14 Feb 2006 14:04:24 +0900 [thread overview]
Message-ID: <20060214050448.058094000@localhost.localdomain> (raw)
In-Reply-To: 20060214050351.252615000@localhost.localdomain
[-- Attachment #1: s390.patch --]
[-- Type: text/plain, Size: 2640 bytes --]
- remove generic_ffs()
- remove generic_fls()
- remove generic_fls64()
- remove generic_hweight{64,32,16,8}()
- remove minix_{test,set,test_and_clear,test,find_first_zero}_bit()
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
arch/s390/Kconfig | 4 ++++
include/asm-s390/bitops.h | 44 +++++---------------------------------------
2 files changed, 9 insertions(+), 39 deletions(-)
Index: 2.6-rc/include/asm-s390/bitops.h
===================================================================
--- 2.6-rc.orig/include/asm-s390/bitops.h
+++ 2.6-rc/include/asm-s390/bitops.h
@@ -828,35 +828,12 @@ static inline int sched_find_first_bit(u
return find_first_bit(b, 140);
}
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-#define ffs(x) generic_ffs(x)
+#include <asm-generic/bitops/ffs.h>
-/*
- * fls: find last bit set.
- */
-#define fls(x) generic_fls(x)
-#define fls64(x) generic_fls64(x)
-
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
-#define hweight64(x) \
-({ \
- unsigned long __x = (x); \
- unsigned int __w; \
- __w = generic_hweight32((unsigned int) __x); \
- __w += generic_hweight32((unsigned int) (__x>>32)); \
- __w; \
-})
-#define hweight32(x) generic_hweight32(x)
-#define hweight16(x) generic_hweight16(x)
-#define hweight8(x) generic_hweight8(x)
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/fls64.h>
+#include <asm-generic/bitops/hweight.h>
#ifdef __KERNEL__
@@ -1011,18 +988,7 @@ ext2_find_next_zero_bit(void *vaddr, uns
return offset + ext2_find_first_zero_bit(p, size);
}
-/* Bitmap functions for the minix filesystem. */
-/* FIXME !!! */
-#define minix_test_and_set_bit(nr,addr) \
- __test_and_set_bit(nr,(unsigned long *)addr)
-#define minix_set_bit(nr,addr) \
- __set_bit(nr,(unsigned long *)addr)
-#define minix_test_and_clear_bit(nr,addr) \
- __test_and_clear_bit(nr,(unsigned long *)addr)
-#define minix_test_bit(nr,addr) \
- test_bit(nr,(unsigned long *)addr)
-#define minix_find_first_zero_bit(addr,size) \
- find_first_zero_bit(addr,size)
+#include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */
Index: 2.6-rc/arch/s390/Kconfig
===================================================================
--- 2.6-rc.orig/arch/s390/Kconfig
+++ 2.6-rc/arch/s390/Kconfig
@@ -14,6 +14,10 @@ config RWSEM_XCHGADD_ALGORITHM
bool
default y
+config GENERIC_HWEIGHT
+ bool
+ default y
+
config GENERIC_CALIBRATE_DELAY
bool
default y
--
next prev parent reply other threads:[~2006-02-14 5:18 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 5:03 [patch 00/47] generic bitops Akinobu Mita
2006-02-14 5:03 ` [patch 01/47] alpha: use config options instead of __alpha_fix__ and __alpha_cix__ Akinobu Mita
2006-02-14 5:03 ` [patch 02/47] ia64: use cpu_set() instead of __set_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 03/47] parisc: add ()-pair in __ffz() macro Akinobu Mita
2006-02-14 5:03 ` [patch 04/47] cris: remove unnecessary local_irq_restore() Akinobu Mita
2006-02-14 5:03 ` [patch 05/47] use non atomic operations for minix_*_bit() and ext2_*_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 06/47] generic {,test_and_}{set,clear,change}_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 07/47] generic __{,test_and_}{set,clear,change}_bit() and test_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 08/47] generic __ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 09/47] generic ffz() Akinobu Mita
2006-02-14 5:04 ` [patch 10/47] generic fls() Akinobu Mita
2006-02-14 5:04 ` [patch 11/47] generic fls64() Akinobu Mita
2006-02-14 5:04 ` [patch 12/47] generic find_{next,first}{,_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 13/47] generic sched_find_first_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 14/47] generic ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 15/47] generic hweight{64,32,16,8}() Akinobu Mita
2006-02-14 5:04 ` [patch 16/47] generic ext2_{set,clear,test,find_first_zero,find_next_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 17/47] generic ext2_{set,clear}_bit_atomic() Akinobu Mita
2006-02-14 5:04 ` [patch 18/47] generic minix_{test,set,test_and_clear,test,find_first_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 19/47] alpha: use generic bitops Akinobu Mita
2006-02-14 5:04 ` [patch 20/47] arm: " Akinobu Mita
2006-02-14 5:04 ` [patch 21/47] arm26: " Akinobu Mita
2006-02-14 5:04 ` [patch 22/47] cris: " Akinobu Mita
2006-02-14 5:04 ` [patch 23/47] frv: " Akinobu Mita
2006-02-14 5:04 ` [patch 24/47] h8300: " Akinobu Mita
2006-02-14 5:04 ` [patch 25/47] i386: " Akinobu Mita
2006-02-14 5:04 ` [patch 26/47] ia64: " Akinobu Mita
2006-02-14 5:04 ` [patch 27/47] m32r: " Akinobu Mita
2006-02-14 5:04 ` [patch 28/47] m68k: " Akinobu Mita
2006-02-14 5:04 ` [patch 29/47] m68knommu: " Akinobu Mita
2006-02-14 5:04 ` [patch 30/47] mips: " Akinobu Mita
2006-02-14 5:04 ` [patch 31/47] parisc: " Akinobu Mita
2006-02-14 5:04 ` [patch 32/47] powerpc: " Akinobu Mita
2006-02-14 5:04 ` Akinobu Mita [this message]
2006-02-14 5:04 ` [patch 34/47] sh: " Akinobu Mita
2006-02-14 5:04 ` [patch 35/47] sh64: " Akinobu Mita
2006-02-14 5:04 ` [patch 36/47] sparc: " Akinobu Mita
2006-02-14 5:04 ` [patch 37/47] sparc64: " Akinobu Mita
2006-02-14 5:04 ` [patch 38/47] v850: " Akinobu Mita
2006-02-14 5:04 ` [patch 39/47] x86_64: " Akinobu Mita
2006-02-14 5:04 ` [patch 40/47] xtensa: " Akinobu Mita
2006-02-14 5:04 ` [patch 41/47] update include/asm-generic/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 42/47] make thread_info.flags an unsigned long Akinobu Mita
2006-02-14 5:04 ` [patch 43/47] ia64: make partial_page.bitmap " Akinobu Mita
2006-02-14 5:04 ` [patch 44/47] ntfs: remove generic_ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 45/47] remove unused generic bitops in include/linux/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 46/47] hweight() related cleanup Akinobu Mita
2006-02-14 5:04 ` [patch 47/47] hweight() speedup Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060214050448.058094000@localhost.localdomain \
--to=mita@miraclelinux.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux390@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox