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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
traps.c
diff --git
a/arch/arm/kernel/traps.c
b/arch/arm/kernel/traps.c
index
e5c7f28
..
3f28167
100644
(file)
--- a/
arch/arm/kernel/traps.c
+++ b/
arch/arm/kernel/traps.c
@@
-263,7
+263,7
@@
asmlinkage void do_undefinstr(struct pt_regs *regs)
unsigned int instr;
struct undef_hook *hook;
siginfo_t info;
unsigned int instr;
struct undef_hook *hook;
siginfo_t info;
- void
__user
*pc;
+ void *pc;
/*
* According to the ARM ARM, PC is 2 or 4 bytes ahead,
/*
* According to the ARM ARM, PC is 2 or 4 bytes ahead,
@@
-272,11
+272,11
@@
asmlinkage void do_undefinstr(struct pt_regs *regs)
*/
regs->ARM_pc -= correction;
*/
regs->ARM_pc -= correction;
- pc = (void
__user
*)instruction_pointer(regs);
+ pc = (void *)instruction_pointer(regs);
if (thumb_mode(regs)) {
if (thumb_mode(regs)) {
- get_user(instr, (u16
__user
*)pc);
+ get_user(instr, (u16 *)pc);
} else {
} else {
- get_user(instr, (u32
__user
*)pc);
+ get_user(instr, (u32 *)pc);
}
spin_lock_irq(&undef_lock);
}
spin_lock_irq(&undef_lock);
@@
-368,7
+368,7
@@
static int bad_syscall(int n, struct pt_regs *regs)
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLTRP;
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLTRP;
- info.si_addr = (void
__user
*)instruction_pointer(regs) -
+ info.si_addr = (void *)instruction_pointer(regs) -
(thumb_mode(regs) ? 2 : 4);
force_sig_info(SIGILL, &info, current);
(thumb_mode(regs) ? 2 : 4);
force_sig_info(SIGILL, &info, current);
@@
-426,7
+426,7
@@
asmlinkage int arm_syscall(int no, struct pt_regs *regs)
/*
* Flush a region from virtual address 'r0' to virtual address 'r1'
/*
* Flush a region from virtual address 'r0' to virtual address 'r1'
- * _
ex
clusive_. There is no alignment requirement on either address;
+ * _
in
clusive_. There is no alignment requirement on either address;
* user space does not need to know the hardware cache layout.
*
* r2 contains flags. It should ALWAYS be passed as ZERO until it
* user space does not need to know the hardware cache layout.
*
* r2 contains flags. It should ALWAYS be passed as ZERO until it
@@
-481,7
+481,7
@@
asmlinkage int arm_syscall(int no, struct pt_regs *regs)
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLTRP;
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLTRP;
- info.si_addr = (void
__user
*)instruction_pointer(regs) -
+ info.si_addr = (void *)instruction_pointer(regs) -
(thumb_mode(regs) ? 2 : 4);
force_sig_info(SIGILL, &info, current);
(thumb_mode(regs) ? 2 : 4);
force_sig_info(SIGILL, &info, current);
@@
-519,7
+519,7
@@
baddataabort(int code, unsigned long instr, struct pt_regs *regs)
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLOPC;
info.si_signo = SIGILL;
info.si_errno = 0;
info.si_code = ILL_ILLOPC;
- info.si_addr = (void
__user
*)addr;
+ info.si_addr = (void *)addr;
force_sig_info(SIGILL, &info, current);
die_if_kernel("unknown data abort code", regs, instr);
force_sig_info(SIGILL, &info, current);
die_if_kernel("unknown data abort code", regs, instr);