From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Will Deacon <will@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Peter Collingbourne <pcc@google.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the arm64-fixes tree
Date: Tue, 1 Dec 2020 08:37:48 +0000 [thread overview]
Message-ID: <20201201083747.GA31404@gaia> (raw)
In-Reply-To: <20201201100547.16b07093@canb.auug.org.au>
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
next prev parent reply other threads:[~2020-12-01 8:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 23:05 linux-next: manual merge of the arm64 tree with the arm64-fixes tree Stephen Rothwell
2020-12-01 8:37 ` Catalin Marinas [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-29 23:35 Stephen Rothwell
2022-07-20 23:45 Stephen Rothwell
2022-07-21 10:45 ` Stephen Rothwell
2022-07-21 16:14 ` Will Deacon
2021-10-06 22:42 Stephen Rothwell
2021-10-07 7:42 ` Will Deacon
2019-06-26 23:35 Stephen Rothwell
2019-06-06 22:38 Stephen Rothwell
2018-03-27 23:19 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201083747.GA31404@gaia \
--to=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pcc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).