linux-kernel - Re: linux-next: manual merge of the arm64 tree with the arm64-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20201201083747.GA31404@gaia>
Date:   Tue, 1 Dec 2020 08:37:48 +0000
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Will Deacon <will@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>,
        Peter Collingbourne <pcc@...gle.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the arm64-fixes
 tree

On Tue, Dec 01, 2020 at 10:05:47AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/exception.h
> index 0756191f44f6,2a8aa1884d8a..000000000000
> --- a/arch/arm64/include/asm/exception.h
> +++ b/arch/arm64/include/asm/exception.h
> @@@ -31,13 -31,8 +31,13 @@@ static inline u32 disr_to_esr(u64 disr
>   	return esr;
>   }
>   
>  +asmlinkage void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs);
>  +asmlinkage void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs);
>   asmlinkage void enter_from_user_mode(void);
>  +asmlinkage void exit_to_user_mode(void);
>  +void arm64_enter_nmi(struct pt_regs *regs);
>  +void arm64_exit_nmi(struct pt_regs *regs);
> - void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
> + void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs);
>   void do_undefinstr(struct pt_regs *regs);
>   void do_bti(struct pt_regs *regs);
>   asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);

Thanks Stephen. It looks alright.

-- 
Catalin