diff options
| author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2004-06-29 05:21:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-29 05:21:25 -0700 |
| commit | d851b028d9ce35b4ccb6500c1cb98eed4606e87e (patch) | |
| tree | 87e0d9f1beffb6df2b752ce9b4bcdd6c0855f8b2 | |
| parent | 8bfb70922e15d80d3ecd7956fe148b04101f831c (diff) | |
[PATCH] Fix Alpha compilation
When using gcc 3.3.3 on alpha, the current BK head doesn't compile.
- there's an external declaration for abs() in the same scope as a macro
definition in arch/alpha/time.c
- The compiler is picky about `const' declarations, which breaks on
bitops.h.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/alpha/kernel/time.c | 1 | ||||
| -rw-r--r-- | include/asm-alpha/bitops.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 35b9761ec956..711124368640 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -523,7 +523,6 @@ EXPORT_SYMBOL(do_settimeofday); * sets the minutes. Usually you won't notice until after reboot! */ -extern int abs(int); static int set_rtc_mmss(unsigned long nowtime) diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 4c0e5f417cf3..22ecbf95ffe1 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h @@ -418,9 +418,9 @@ find_next_zero_bit(void * addr, unsigned long size, unsigned long offset) * Find next one bit in a bitmap reasonably efficiently. */ static inline unsigned long -find_next_bit(void * addr, unsigned long size, unsigned long offset) +find_next_bit(const void * addr, unsigned long size, unsigned long offset) { - unsigned long * p = ((unsigned long *) addr) + (offset >> 6); + const unsigned long * p = ((const unsigned long *) addr) + (offset >> 6); unsigned long result = offset & ~63UL; unsigned long tmp; |