diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
commit | 67cbf8a216259dceefe570f6dc14746f43b2e627 (patch) | |
tree | 1eca0b9922dee01b4d00dc0713b7ff434dddd44c /arch/arm/kernel/entry-common.S | |
parent | 6c941c8556dd9269be621cd8159fc60e955a91b3 (diff) | |
parent | 2fbe74b90bafebce615466b4c20f96b0465df1ae (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
-rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f0fe95b7085..2c1db77d784 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -416,12 +416,12 @@ sys_mmap2: tst r5, #PGOFF_MASK moveq r5, r5, lsr #PAGE_SHIFT - 12 streq r5, [sp, #4] - beq do_mmap2 + beq sys_mmap_pgoff mov r0, #-EINVAL mov pc, lr #else str r5, [sp, #4] - b do_mmap2 + b sys_mmap_pgoff #endif ENDPROC(sys_mmap2) |