diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /include/asm-generic/bitops/__fls.h | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'include/asm-generic/bitops/__fls.h')
| -rw-r--r-- | include/asm-generic/bitops/__fls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h index be24465403d6..a60a7ccb6782 100644 --- a/include/asm-generic/bitops/__fls.h +++ b/include/asm-generic/bitops/__fls.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * | 9 | * |
| 10 | * Undefined if no set bit exists, so code should check against 0 first. | 10 | * Undefined if no set bit exists, so code should check against 0 first. |
| 11 | */ | 11 | */ |
| 12 | static inline unsigned long __fls(unsigned long word) | 12 | static __always_inline unsigned long __fls(unsigned long word) |
| 13 | { | 13 | { |
| 14 | int num = BITS_PER_LONG - 1; | 14 | int num = BITS_PER_LONG - 1; |
| 15 | 15 | ||