git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] 5421/1: ftrace: fix crash due to tracing of __naked functions
[safe/jmp/linux-2.6]
/
arch
/
arm
/
kernel
/
fiq.c
diff --git
a/arch/arm/kernel/fiq.c
b/arch/arm/kernel/fiq.c
index
e8e9034
..
6ff7919
100644
(file)
--- a/
arch/arm/kernel/fiq.c
+++ b/
arch/arm/kernel/fiq.c
@@
-45,7
+45,6
@@
#include <asm/fiq.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/fiq.h>
#include <asm/irq.h>
#include <asm/system.h>
-#include <asm/uaccess.h>
static unsigned long no_fiq_insn;
static unsigned long no_fiq_insn;
@@
-89,7
+88,7
@@
void set_fiq_handler(void *start, unsigned int length)
* disable irqs for the duration. Note - these functions are almost
* entirely coded in assembly.
*/
* disable irqs for the duration. Note - these functions are almost
* entirely coded in assembly.
*/
-void __
attribute__((naked))
set_fiq_regs(struct pt_regs *regs)
+void __
naked
set_fiq_regs(struct pt_regs *regs)
{
register unsigned long tmp;
asm volatile (
{
register unsigned long tmp;
asm volatile (
@@
-107,7
+106,7
@@
void __attribute__((naked)) set_fiq_regs(struct pt_regs *regs)
: "r" (®s->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));
}
: "r" (®s->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));
}
-void __
attribute__((naked))
get_fiq_regs(struct pt_regs *regs)
+void __
naked
get_fiq_regs(struct pt_regs *regs)
{
register unsigned long tmp;
asm volatile (
{
register unsigned long tmp;
asm volatile (