History

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Linus Torvalds committed 21 years ago

Commit dd41bf92 parents 70ab81c 7edc24c2 files · +2 −1Browse files

Showing the changes to include (1 of 2 files). Show all

Unified · Split

include/asm-arm/bitops.h+0−1
@@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) · 346 unmodified lines
347 * the clz instruction for much better code efficiency.347 * the clz instruction for much better code efficiency.
348 */348 */
349 349
350static __inline__ int generic_fls(int x);
351#define fls(x) \350#define fls(x) \
352 ( __builtin_constant_p(x) ? generic_fls(x) : \351 ( __builtin_constant_p(x) ? generic_fls(x) : \
353 ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )352 ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t