diff options
author | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 16:45:43 +1000 |
---|---|---|
committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2006-09-29 16:45:43 +1000 |
commit | 1b06e7926694178e146ff708b2c15a6da64c9765 (patch) | |
tree | 30602fa4a854d6956f478212937726ca75ea13ce /arch/arm/mm/alignment.c | |
parent | 65e8697a12e356cd7a6ecafa1149f5c5c6a71593 (diff) | |
parent | c972398b7871d9fb58c6a317786065a7cc6ca4be (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mm/alignment.c')
-rw-r--r-- | arch/arm/mm/alignment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index e0d21bbbe7d7..aa109f074dd9 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -735,7 +735,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) /* * We got a fault - fix it up, or die. */ - do_bad_area(current, current->mm, addr, fsr, regs); + do_bad_area(addr, fsr, regs); return 0; swp: |