diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 15:08:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 15:08:37 -0800 |
| commit | a90fcf311199b0199e94e78fca899abf2aeb852b (patch) | |
| tree | 0b916c9f11006d4452eefa2013a4c63a9ed4d43f /include | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SPARC64]: Use "is_power_of_2" macro for simplicity. (diff) | |
| download | linux-dev-a90fcf311199b0199e94e78fca899abf2aeb852b.tar.xz linux-dev-a90fcf311199b0199e94e78fca899abf2aeb852b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Use "is_power_of_2" macro for simplicity.
[SPARC]: Remove duplicate includes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/vio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/vio.h b/include/asm-sparc64/vio.h index f7417e91b170..d4de32f0f8af 100644 --- a/include/asm-sparc64/vio.h +++ b/include/asm-sparc64/vio.h @@ -8,6 +8,7 @@ #include <linux/spinlock.h> #include <linux/completion.h> #include <linux/list.h> +#include <linux/log2.h> #include <asm/ldc.h> #include <asm/mdesc.h> @@ -257,8 +258,7 @@ static inline void *vio_dring_entry(struct vio_dring_state *dr, static inline u32 vio_dring_avail(struct vio_dring_state *dr, unsigned int ring_size) { - /* Ensure build-time power-of-2. */ - BUILD_BUG_ON(ring_size & (ring_size - 1)); + BUILD_BUG_ON(!is_power_of_2(ring_size)); return (dr->pending - ((dr->prod - dr->cons) & (ring_size - 1))); |