hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d
kernel/arch/sh/include/asm/bitops.h
....@@ -2,8 +2,6 @@
22 #ifndef __ASM_SH_BITOPS_H
33 #define __ASM_SH_BITOPS_H
44
5
-#ifdef __KERNEL__
6
-
75 #ifndef _LINUX_BITOPS_H
86 #error only <linux/bitops.h> can be included directly
97 #endif
....@@ -26,7 +24,6 @@
2624 #include <asm-generic/bitops/non-atomic.h>
2725 #endif
2826
29
-#ifdef CONFIG_SUPERH32
3027 static inline unsigned long ffz(unsigned long word)
3128 {
3229 unsigned long result;
....@@ -60,31 +57,6 @@
6057 : "t");
6158 return result;
6259 }
63
-#else
64
-static inline unsigned long ffz(unsigned long word)
65
-{
66
- unsigned long result, __d2, __d3;
67
-
68
- __asm__("gettr tr0, %2\n\t"
69
- "pta $+32, tr0\n\t"
70
- "andi %1, 1, %3\n\t"
71
- "beq %3, r63, tr0\n\t"
72
- "pta $+4, tr0\n"
73
- "0:\n\t"
74
- "shlri.l %1, 1, %1\n\t"
75
- "addi %0, 1, %0\n\t"
76
- "andi %1, 1, %3\n\t"
77
- "beqi %3, 1, tr0\n"
78
- "1:\n\t"
79
- "ptabs %2, tr0\n\t"
80
- : "=r" (result), "=r" (word), "=r" (__d2), "=r" (__d3)
81
- : "0" (0L), "1" (word));
82
-
83
- return result;
84
-}
85
-
86
-#include <asm-generic/bitops/__ffs.h>
87
-#endif
8860
8961 #include <asm-generic/bitops/find.h>
9062 #include <asm-generic/bitops/ffs.h>
....@@ -96,7 +68,5 @@
9668 #include <asm-generic/bitops/fls.h>
9769 #include <asm-generic/bitops/__fls.h>
9870 #include <asm-generic/bitops/fls64.h>
99
-
100
-#endif /* __KERNEL__ */
10171
10272 #endif /* __ASM_SH_BITOPS_H */