summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 15:57:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-04 15:57:53 -0700
commit50165d8b1d915422343079f79a878a0f7572feaa (patch)
tree55358d0e902b34c6d45f73afb16310e686212669 /arch/arm/kernel/traps.c
parent944d2647dded12e2b05ad8ebc020644bb1997ce1 (diff)
parentc2f480869fa7559fa3532e415e3e3ec49339f208 (diff)
downloadop-kernel-dev-50165d8b1d915422343079f79a878a0f7572feaa.zip
op-kernel-dev-50165d8b1d915422343079f79a878a0f7572feaa.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index e7d22db..f6de76e 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -504,7 +504,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
bad_access:
spin_unlock(&mm->page_table_lock);
- /* simulate a read access fault */
+ /* simulate a write access fault */
do_DataAbort(addr, 15 + (1 << 11), regs);
return -1;
}
OpenPOWER on IntegriCloud