Commit d851b028 authored by Peter Chubb's avatar Peter Chubb Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8bfb7092
...@@ -523,7 +523,6 @@ EXPORT_SYMBOL(do_settimeofday); ...@@ -523,7 +523,6 @@ EXPORT_SYMBOL(do_settimeofday);
* sets the minutes. Usually you won't notice until after reboot! * sets the minutes. Usually you won't notice until after reboot!
*/ */
extern int abs(int);
static int static int
set_rtc_mmss(unsigned long nowtime) set_rtc_mmss(unsigned long nowtime)
......
...@@ -418,9 +418,9 @@ find_next_zero_bit(void * addr, unsigned long size, unsigned long offset) ...@@ -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. * Find next one bit in a bitmap reasonably efficiently.
*/ */
static inline unsigned long 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 result = offset & ~63UL;
unsigned long tmp; unsigned long tmp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment