git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm26
/
kernel
/
traps.c
diff --git
a/arch/arm26/kernel/traps.c
b/arch/arm26/kernel/traps.c
index
f0a49fe
..
f64f590
100644
(file)
--- a/
arch/arm26/kernel/traps.c
+++ b/
arch/arm26/kernel/traps.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/arch/arm/kernel/traps.c
+ * linux/arch/arm
26
/kernel/traps.c
*
* Copyright (C) 1995-2002 Russell King
* Fragments that appear the same as linux/arch/i386/kernel/traps.c (C) Linus Torvalds
*
* Copyright (C) 1995-2002 Russell King
* Fragments that appear the same as linux/arch/i386/kernel/traps.c (C) Linus Torvalds
@@
-10,9
+10,11
@@
* published by the Free Software Foundation.
*
* 'traps.c' handles hardware exceptions after we have saved some state in
* published by the Free Software Foundation.
*
* 'traps.c' handles hardware exceptions after we have saved some state in
- * 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably
+ * 'linux/arch/arm
26
/lib/traps.S'. Mostly a debugging aid, but will probably
* kill the offending process.
*/
* kill the offending process.
*/
+
+#include <linux/module.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-28,7
+30,6
@@
#include <asm/atomic.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <asm/io.h>
-#include <asm/pgalloc.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@
-134,8
+135,6
@@
static void dump_instr(struct pt_regs *regs)
dump_mem("Stack: ", sp, 8192+(unsigned long)tsk->thread_info);
}
dump_mem("Stack: ", sp, 8192+(unsigned long)tsk->thread_info);
}
-EXPORT_SYMBOL(dump_stack);
-
void dump_stack(void)
{
#ifdef CONFIG_DEBUG_ERRORS
void dump_stack(void)
{
#ifdef CONFIG_DEBUG_ERRORS
@@
-143,6
+142,8
@@
void dump_stack(void)
#endif
}
#endif
}
+EXPORT_SYMBOL(dump_stack);
+
//FIXME - was a static fn
void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
{
//FIXME - was a static fn
void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
{
@@
-170,7
+171,7
@@
void show_stack(struct task_struct *task, unsigned long *sp) {
dump_mem("Stack: ", (unsigned long)sp, 8192+(unsigned long)task->thread_info);
}
dump_mem("Stack: ", (unsigned long)sp, 8192+(unsigned long)task->thread_info);
}
-
spinlock_t die_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(die_lock)
;
/*
* This function is protected against re-entrancy.
/*
* This function is protected against re-entrancy.
@@
-425,7
+426,6
@@
asmlinkage int arm_syscall(int no, struct pt_regs *regs)
return 0;
case NR(usr26):
return 0;
case NR(usr26):
- case NR(usr32):
break;
default:
break;
default: