aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/kdebug.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/kdebug.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/kdebug.h')
-rw-r--r--include/asm-sparc/kdebug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/kdebug.h b/include/asm-sparc/kdebug.h
index 3ea4916635ee..fba92485fdba 100644
--- a/include/asm-sparc/kdebug.h
+++ b/include/asm-sparc/kdebug.h
@@ -46,7 +46,7 @@ struct kernel_debug {
extern struct kernel_debug *linux_dbvec;
/* Use this macro in C-code to enter the debugger. */
-extern __inline__ void sp_enter_debugger(void)
+static inline void sp_enter_debugger(void)
{
__asm__ __volatile__("jmpl %0, %%o7\n\t"
"nop\n\t" : :