git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
kgdb_64.c
diff --git
a/arch/sparc/kernel/kgdb_64.c
b/arch/sparc/kernel/kgdb_64.c
index
f5a0fd4
..
0a2bd0f
100644
(file)
--- a/
arch/sparc/kernel/kgdb_64.c
+++ b/
arch/sparc/kernel/kgdb_64.c
@@
-5,6
+5,7
@@
#include <linux/kgdb.h>
#include <linux/kdebug.h>
#include <linux/kgdb.h>
#include <linux/kdebug.h>
+#include <linux/ftrace.h>
#include <asm/kdebug.h>
#include <asm/ptrace.h>
#include <asm/kdebug.h>
#include <asm/ptrace.h>
@@
-108,7
+109,7
@@
void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
}
#ifdef CONFIG_SMP
}
#ifdef CONFIG_SMP
-void smp_kgdb_capture_client(int irq, struct pt_regs *regs)
+void
__irq_entry
smp_kgdb_capture_client(int irq, struct pt_regs *regs)
{
unsigned long flags;
{
unsigned long flags;