diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
| commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
| tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /include/asm-generic/bitops/__fls.h | |
| parent | x86: hpet: allow force enable on ICH10 HPET (diff) | |
| parent | Merge branch 'hibernate' (diff) | |
| download | linux-2702e0a46c2d28da92b32c9b068ee1291fc0de35.tar.xz linux-2702e0a46c2d28da92b32c9b068ee1291fc0de35.zip | |
Merge branch 'linus' into timers/hpet
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 @@ * * Undefined if no set bit exists, so code should check against 0 first. */ -static inline unsigned long __fls(unsigned long word) +static __always_inline unsigned long __fls(unsigned long word) { int num = BITS_PER_LONG - 1; |