summaryrefslogtreecommitdiff
path: root/include/asm-blackfin
diff options
context:
space:
mode:
authorSimon Kagstrom <simon.kagstrom@netinsight.net>2009-09-17 15:15:52 +0200
committerWolfgang Denk <wd@denx.de>2009-09-17 22:45:31 +0200
commit0413cfecea350000eab5e591a0965c3e3ee0ff00 (patch)
tree5375713a0a077db87d0d222ce591800f768a2ca5 /include/asm-blackfin
parent15fba3279b56333bdb65ead366f82c945ed320d1 (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/asm-blackfin')
-rw-r--r--include/asm-blackfin/bitops.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/asm-blackfin/bitops.h b/include/asm-blackfin/bitops.h
index cc3685d35..ab1fea55c 100644
--- a/include/asm-blackfin/bitops.h
+++ b/include/asm-blackfin/bitops.h
@@ -79,7 +79,7 @@ static __inline__ void __set_bit(int nr, volatile void *addr)
mask = 1 << (nr & 0x1f);
*a |= mask;
}
-#define __set_bit
+#define PLATFORM__SET_BIT
/*
* clear_bit() doesn't provide any barrier for the compiler.
@@ -270,14 +270,6 @@ static __inline__ int find_next_zero_bit(void *addr, int size, int offset)
}
/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-
-#define ffs(x) generic_ffs(x)
-
-/*
* hweightN: returns the hamming weight (i.e. the number
* of bits set) of a N-bit word
*/