Skip to content

Commit f46ccdb

Browse files
hcahcaAlexander Gordeev
authored andcommitted
s390/bitops: Cleanup __flogr()
The flogr() inline assembly has no side effects and generates the same output if the input does not change. Therefore remove the volatile qualifier to allow the compiler to optimize the inline assembly away, if possible. Also remove the superfluous '\n' which makes the inline assembly appear larger than it is according to compiler heuristics (number of lines). Furthermore change the return type of flogr() to unsigned long and add the const attribute to the function. This reduces the kernel image size by 994 bytes (defconfig, gcc 15.2.0). Suggested-by: Juergen Christ <jchrist@linux.ibm.com> Reviewed-by: Juergen Christ <jchrist@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 7916160 commit f46ccdb

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

arch/s390/include/asm/bitops.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static inline bool test_bit_inv(unsigned long nr,
130130
* where the most significant bit has bit number 0.
131131
* If no bit is set this function returns 64.
132132
*/
133-
static __always_inline unsigned char __flogr(unsigned long word)
133+
static __always_inline __attribute_const__ unsigned long __flogr(unsigned long word)
134134
{
135135
unsigned long bit;
136136

@@ -167,9 +167,8 @@ static __always_inline unsigned char __flogr(unsigned long word)
167167
union register_pair rp __uninitialized;
168168

169169
rp.even = word;
170-
asm volatile(
171-
" flogr %[rp],%[rp]\n"
172-
: [rp] "+d" (rp.pair) : : "cc");
170+
asm("flogr %[rp],%[rp]"
171+
: [rp] "+d" (rp.pair) : : "cc");
173172
bit = rp.even;
174173
/*
175174
* The result of the flogr instruction is a value in the range

0 commit comments

Comments
 (0)