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/kernel/process.c | |
| parent | 0f5a2c553d1484141ebb369ecab61894e9cb074f (diff) | |
| parent | 6ee4e28be80add86a64908472e4b7ab01dab33d9 (diff) | |
| download | linux-a2508c0814c6d2c0259fa859a6184343b1e39ea3.tar.gz linux-a2508c0814c6d2c0259fa859a6184343b1e39ea3.tar.bz2 linux-a2508c0814c6d2c0259fa859a6184343b1e39ea3.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:
[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/kernel/process.c')
| -rw-r--r-- | arch/sparc/kernel/process.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 33f7a3ddb104..77460e316a03 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c @@ -1,7 +1,6 @@ -/* $Id: process.c,v 1.161 2002/01/23 11:27:32 davem Exp $ - * linux/arch/sparc/kernel/process.c +/* linux/arch/sparc/kernel/process.c * - * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) + * Copyright (C) 1995 David S. Miller (davem@davemloft.net) * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) */ @@ -397,7 +396,7 @@ void flush_thread(void) } } -static __inline__ struct sparc_stackf __user * +static inline struct sparc_stackf __user * clone_stackframe(struct sparc_stackf __user *dst, struct sparc_stackf __user *src) { |