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 'devel' into next
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
traps.c
diff --git
a/arch/m32r/kernel/traps.c
b/arch/m32r/kernel/traps.c
index
5fe8ed6
..
46159a4
100644
(file)
--- a/
arch/m32r/kernel/traps.c
+++ b/
arch/m32r/kernel/traps.c
@@
-9,7
+9,6
@@
* 'traps.c' handles hardware traps and faults after we have saved some
* state in 'entry.S'.
*/
* 'traps.c' handles hardware traps and faults after we have saved some
* state in 'entry.S'.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/kallsyms.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/kallsyms.h>
@@
-41,6
+40,7
@@
extern void smp_invalidate_interrupt(void);
extern void smp_call_function_interrupt(void);
extern void smp_ipi_timer_interrupt(void);
extern void smp_flush_cache_all_interrupt(void);
extern void smp_call_function_interrupt(void);
extern void smp_ipi_timer_interrupt(void);
extern void smp_flush_cache_all_interrupt(void);
+extern void smp_call_function_single_interrupt(void);
/*
* for Boot AP function
/*
* for Boot AP function
@@
-104,7
+104,7
@@
void set_eit_vector_entries(void)
eit_vector[186] = (unsigned long)smp_call_function_interrupt;
eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;
eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;
eit_vector[186] = (unsigned long)smp_call_function_interrupt;
eit_vector[187] = (unsigned long)smp_ipi_timer_interrupt;
eit_vector[188] = (unsigned long)smp_flush_cache_all_interrupt;
- eit_vector[189] =
0
;
+ eit_vector[189] =
(unsigned long)smp_call_function_single_interrupt
;
eit_vector[190] = 0;
eit_vector[191] = 0;
#endif
eit_vector[190] = 0;
eit_vector[191] = 0;
#endif
@@
-197,7
+197,7
@@
static void show_registers(struct pt_regs *regs)
printk("SPI: %08lx\n", sp);
}
printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
printk("SPI: %08lx\n", sp);
}
printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
- current->comm,
current->pid
, 0xffff & i, 4096+(unsigned long)current);
+ current->comm,
task_pid_nr(current)
, 0xffff & i, 4096+(unsigned long)current);
/*
* When in-kernel, we also print out the stack and code at the
/*
* When in-kernel, we also print out the stack and code at the
@@
-269,7
+269,7
@@
static __inline__ void do_trap(int trapnr, int signr, const char * str,
#define DO_ERROR(trapnr, signr, str, name) \
asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
{ \
#define DO_ERROR(trapnr, signr, str, name) \
asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
{ \
- do_trap(trapnr, signr,
0
, regs, error_code, NULL); \
+ do_trap(trapnr, signr,
NULL
, regs, error_code, NULL); \
}
#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
}
#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \