diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
| commit | a2508c0814c6d2c0259fa859a6184343b1e39ea3 (patch) | |
| tree | 3c42cb3daf50b419f8cc20ff1625647306b66e0d /arch/sparc/mm/btfixup.c | |
| parent | 0f5a2c553d1484141ebb369ecab61894e9cb074f (diff) | |
| parent | 6ee4e28be80add86a64908472e4b7ab01dab33d9 (diff) | |
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:
[SPARC32]: Fix build-warning in io-unit.c
[SPARC64]: Fix BACKOFF_SPIN on non-SMP.
[SPARC32]: __inline__ --> inline
[SPARC64]: __inline__ --> inline
Diffstat (limited to 'arch/sparc/mm/btfixup.c')
| -rw-r--r-- | arch/sparc/mm/btfixup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c index ec4231c2855..a312d127d47 100644 --- a/arch/sparc/mm/btfixup.c +++ b/arch/sparc/mm/btfixup.c @@ -1,5 +1,4 @@ -/* $Id: btfixup.c,v 1.10 2000/05/09 17:40:13 davem Exp $ - * btfixup.c: Boot time code fixup and relocator, so that +/* btfixup.c: Boot time code fixup and relocator, so that * we can get rid of most indirect calls to achieve single * image sun4c and srmmu kernel. * @@ -69,7 +68,7 @@ static void __init set_addr(unsigned int *addr, unsigned int q1, int fmangled, u } } #else -static __inline__ void set_addr(unsigned int *addr, unsigned int q1, int fmangled, unsigned int value) +static inline void set_addr(unsigned int *addr, unsigned int q1, int fmangled, unsigned int value) { *addr = value; } |