ARM: entry: Remove dead code in sys_mmap2
diff mbox

Message ID 1502700269-24384-2-git-send-email-vladimir.murzin@arm.com
State New, archived
Headers show

Commit Message

Vladimir Murzin Aug. 14, 2017, 8:44 a.m. UTC
We support page size of 4K only, remove dead code.

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
---
 arch/arm/kernel/entry-common.S | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Vladimir Murzin Sept. 1, 2017, 10:35 a.m. UTC | #1
On 14/08/17 09:44, Vladimir Murzin wrote:
> We support page size of 4K only, remove dead code.
>
> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
> ---
>  arch/arm/kernel/entry-common.S | 9 ---------
>  1 file changed, 9 deletions(-)
>
> diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
> index eb5cd77..52237ce 100644
> --- a/arch/arm/kernel/entry-common.S
> +++ b/arch/arm/kernel/entry-common.S
> @@ -371,17 +371,8 @@ ENDPROC(sys_fstatfs64_wrapper)
>   * offset, we return EINVAL.
>   */
>  sys_mmap2:
> -#if PAGE_SHIFT > 12
> -             tst     r5, #PGOFF_MASK
> -             moveq   r5, r5, lsr #PAGE_SHIFT - 12
> -             streq   r5, [sp, #4]
> -             beq     sys_mmap_pgoff
> -             mov     r0, #-EINVAL
> -             ret     lr
> -#else
>               str     r5, [sp, #4]
>               b       sys_mmap_pgoff
> -#endif
>  ENDPROC(sys_mmap2)
>
>  #ifdef CONFIG_OABI_COMPAT
>

Ok for patch tracker?

Vladimir
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
Russell King - ARM Linux admin Sept. 1, 2017, 11:05 p.m. UTC | #2
On Fri, Sep 01, 2017 at 11:35:00AM +0100, Vladimir Murzin wrote:
> On 14/08/17 09:44, Vladimir Murzin wrote:
> > We support page size of 4K only, remove dead code.
> >
> > Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
> > ---
> >  arch/arm/kernel/entry-common.S | 9 ---------
> >  1 file changed, 9 deletions(-)
> >
> > diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
> > index eb5cd77..52237ce 100644
> > --- a/arch/arm/kernel/entry-common.S
> > +++ b/arch/arm/kernel/entry-common.S
> > @@ -371,17 +371,8 @@ ENDPROC(sys_fstatfs64_wrapper)
> >   * offset, we return EINVAL.
> >   */
> >  sys_mmap2:
> > -#if PAGE_SHIFT > 12
> > -             tst     r5, #PGOFF_MASK
> > -             moveq   r5, r5, lsr #PAGE_SHIFT - 12
> > -             streq   r5, [sp, #4]
> > -             beq     sys_mmap_pgoff
> > -             mov     r0, #-EINVAL
> > -             ret     lr
> > -#else
> >               str     r5, [sp, #4]
> >               b       sys_mmap_pgoff
> > -#endif
> >  ENDPROC(sys_mmap2)
> >
> >  #ifdef CONFIG_OABI_COMPAT
> >
> 
> Ok for patch tracker?

Yep.

Patch
diff mbox

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index eb5cd77..52237ce 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -371,17 +371,8 @@  ENDPROC(sys_fstatfs64_wrapper)
  * offset, we return EINVAL.
  */
 sys_mmap2:
-#if PAGE_SHIFT > 12
-		tst	r5, #PGOFF_MASK
-		moveq	r5, r5, lsr #PAGE_SHIFT - 12
-		streq	r5, [sp, #4]
-		beq	sys_mmap_pgoff
-		mov	r0, #-EINVAL
-		ret	lr
-#else
 		str	r5, [sp, #4]
 		b	sys_mmap_pgoff
-#endif
 ENDPROC(sys_mmap2)
 
 #ifdef CONFIG_OABI_COMPAT