aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/processor.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 08:11:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 08:11:13 -0700
commit43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch)
tree67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/processor.h
parent[PATCH] sungem: fix gfp flags type (diff)
parent[SUNSU]: Fix bogus locking in sunsu_change_mouse_baud() (diff)
downloadlinux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.tar.xz
linux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/processor.h')
-rw-r--r--include/asm-sparc/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h
index 5a7a1a8d29ac..6fbb3f0af8d8 100644
--- a/include/asm-sparc/processor.h
+++ b/include/asm-sparc/processor.h
@@ -79,7 +79,7 @@ struct thread_struct {
extern unsigned long thread_saved_pc(struct task_struct *t);
/* Do necessary setup to start up a newly executed thread. */
-extern __inline__ void start_thread(struct pt_regs * regs, unsigned long pc,
+static inline void start_thread(struct pt_regs * regs, unsigned long pc,
unsigned long sp)
{
register unsigned long zero asm("g1");