diff options
| author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2009-09-17 15:15:52 +0200 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2009-10-03 09:04:30 -0500 |
| commit | ef6061e49ba66ecfec09f0049ba22ce3f5125c11 (patch) | |
| tree | 448687c7828351fe25de0851498aaa4fa6f129c5 /include/linux | |
| parent | 012f51e7c1412b2e38b7e8f541889607154b6777 (diff) | |
Correct ffs/fls regression for PowerPC etc
Commits
02f99901ed1c9d828e3ea117f94ce2264bf8389e
52d61227b66d4099b39c8309ab37cb67ee09a405
introduced a regression where platform-specific ffs/fls implementations
were defined away. This patch corrects that by using PLATFORM_xxx
instead of the name itself.
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bitops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index e14e6c7b14..e724310298 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -111,19 +111,19 @@ static inline unsigned int generic_hweight8(unsigned int w) /* linux/include/asm-generic/bitops/non-atomic.h */ -#ifndef __set_bit +#ifndef PLATFORM__SET_BIT # define __set_bit generic_set_bit #endif -#ifndef __clear_bit +#ifndef PLATFORM__CLEAR_BIT # define __clear_bit generic_clear_bit #endif -#ifndef ffs +#ifndef PLATFORM_FFS # define ffs generic_ffs #endif -#ifndef fls +#ifndef PLATFORM_FLS # define fls generic_fls #endif |