diff options
-rw-r--r-- | arch/s390/Kconfig | 4 | ||||
-rw-r--r-- | include/asm-s390/bitops.h | 44 |
2 files changed, 9 insertions, 39 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 2b7364ed23bc..01c5c082f970 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -14,6 +14,10 @@ config RWSEM_XCHGADD_ALGORITHM | |||
14 | bool | 14 | bool |
15 | default y | 15 | default y |
16 | 16 | ||
17 | config GENERIC_HWEIGHT | ||
18 | bool | ||
19 | default y | ||
20 | |||
17 | config GENERIC_CALIBRATE_DELAY | 21 | config GENERIC_CALIBRATE_DELAY |
18 | bool | 22 | bool |
19 | default y | 23 | default y |
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h index 6b6a01dfc8dc..ca092ffb7a95 100644 --- a/include/asm-s390/bitops.h +++ b/include/asm-s390/bitops.h | |||
@@ -828,35 +828,12 @@ static inline int sched_find_first_bit(unsigned long *b) | |||
828 | return find_first_bit(b, 140); | 828 | return find_first_bit(b, 140); |
829 | } | 829 | } |
830 | 830 | ||
831 | /* | 831 | #include <asm-generic/bitops/ffs.h> |
832 | * ffs: find first bit set. This is defined the same way as | ||
833 | * the libc and compiler builtin ffs routines, therefore | ||
834 | * differs in spirit from the above ffz (man ffs). | ||
835 | */ | ||
836 | #define ffs(x) generic_ffs(x) | ||
837 | 832 | ||
838 | /* | 833 | #include <asm-generic/bitops/fls.h> |
839 | * fls: find last bit set. | 834 | #include <asm-generic/bitops/fls64.h> |
840 | */ | ||
841 | #define fls(x) generic_fls(x) | ||
842 | #define fls64(x) generic_fls64(x) | ||
843 | |||
844 | /* | ||
845 | * hweightN: returns the hamming weight (i.e. the number | ||
846 | * of bits set) of a N-bit word | ||
847 | */ | ||
848 | #define hweight64(x) \ | ||
849 | ({ \ | ||
850 | unsigned long __x = (x); \ | ||
851 | unsigned int __w; \ | ||
852 | __w = generic_hweight32((unsigned int) __x); \ | ||
853 | __w += generic_hweight32((unsigned int) (__x>>32)); \ | ||
854 | __w; \ | ||
855 | }) | ||
856 | #define hweight32(x) generic_hweight32(x) | ||
857 | #define hweight16(x) generic_hweight16(x) | ||
858 | #define hweight8(x) generic_hweight8(x) | ||
859 | 835 | ||
836 | #include <asm-generic/bitops/hweight.h> | ||
860 | 837 | ||
861 | #ifdef __KERNEL__ | 838 | #ifdef __KERNEL__ |
862 | 839 | ||
@@ -1011,18 +988,7 @@ ext2_find_next_zero_bit(void *vaddr, unsigned long size, unsigned long offset) | |||
1011 | return offset + ext2_find_first_zero_bit(p, size); | 988 | return offset + ext2_find_first_zero_bit(p, size); |
1012 | } | 989 | } |
1013 | 990 | ||
1014 | /* Bitmap functions for the minix filesystem. */ | 991 | #include <asm-generic/bitops/minix.h> |
1015 | /* FIXME !!! */ | ||
1016 | #define minix_test_and_set_bit(nr,addr) \ | ||
1017 | __test_and_set_bit(nr,(unsigned long *)addr) | ||
1018 | #define minix_set_bit(nr,addr) \ | ||
1019 | __set_bit(nr,(unsigned long *)addr) | ||
1020 | #define minix_test_and_clear_bit(nr,addr) \ | ||
1021 | __test_and_clear_bit(nr,(unsigned long *)addr) | ||
1022 | #define minix_test_bit(nr,addr) \ | ||
1023 | test_bit(nr,(unsigned long *)addr) | ||
1024 | #define minix_find_first_zero_bit(addr,size) \ | ||
1025 | find_first_zero_bit(addr,size) | ||
1026 | 992 | ||
1027 | #endif /* __KERNEL__ */ | 993 | #endif /* __KERNEL__ */ |
1028 | 994 | ||