From: Catalin Marinas <catalin.marinas@arm.com>
To: Mark Brown <broonie@kernel.org>
Cc: "Will Deacon" <will@kernel.org>,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
"Paul Elliott" <paul.elliott@arm.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Yu-cheng Yu" <yu-cheng.yu@intel.com>,
"Amit Kachhap" <amit.kachhap@arm.com>,
"Vincenzo Frascino" <vincenzo.frascino@arm.com>,
"Marc Zyngier" <maz@kernel.org>,
"Eugene Syromiatnikov" <esyr@redhat.com>,
"Szabolcs Nagy" <szabolcs.nagy@arm.com>,
"H . J . Lu " <hjl.tools@gmail.com>,
"Andrew Jones" <drjones@redhat.com>,
"Kees Cook" <keescook@chromium.org>,
"Arnd Bergmann" <arnd@arndb.de>, "Jann Horn" <jannh@google.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Kristina Martšenko" <kristina.martsenko@arm.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Florian Weimer" <fweimer@redhat.com>,
"Sudakshina Das" <sudi.das@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-fsdevel@vger.kernel.org,
"Dave Martin" <Dave.Martin@arm.com>
Subject: Re: [PATCH v9 08/13] arm64: traps: Shuffle code to eliminate forward declarations
Date: Sat, 14 Mar 2020 11:18:23 +0000 [thread overview]
Message-ID: <20200314111823.GA21082@mbp> (raw)
In-Reply-To: <20200311192608.40095-9-broonie@kernel.org>
On Wed, Mar 11, 2020 at 07:26:03PM +0000, Mark Brown wrote:
> diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
> index bc9f4292bfc3..3c07a7074145 100644
> --- a/arch/arm64/kernel/traps.c
> +++ b/arch/arm64/kernel/traps.c
> @@ -272,7 +272,55 @@ void arm64_notify_die(const char *str, struct pt_regs *regs,
> }
> }
>
> -static void advance_itstate(struct pt_regs *regs);
> +#ifdef CONFIG_COMPAT
> +#define PSTATE_IT_1_0_SHIFT 25
> +#define PSTATE_IT_1_0_MASK (0x3 << PSTATE_IT_1_0_SHIFT)
> +#define PSTATE_IT_7_2_SHIFT 10
> +#define PSTATE_IT_7_2_MASK (0x3f << PSTATE_IT_7_2_SHIFT)
[...]
> @@ -578,34 +626,6 @@ static const struct sys64_hook sys64_hooks[] = {
> {},
> };
>
> -
> -#ifdef CONFIG_COMPAT
> -#define PSTATE_IT_1_0_SHIFT 25
> -#define PSTATE_IT_1_0_MASK (0x3 << PSTATE_IT_1_0_SHIFT)
> -#define PSTATE_IT_7_2_SHIFT 10
> -#define PSTATE_IT_7_2_MASK (0x3f << PSTATE_IT_7_2_SHIFT)
This patch breaks the kernel build with CONFIG_COMPAT disabled (e.g. 64K
page configuration) as sys64_hooks[] ends up in the #ifdef/#endif block.
--
Catalin
next prev parent reply other threads:[~2020-03-15 2:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 19:25 [PATCH v9 00/13] arm64: Branch Target Identification support Mark Brown
2020-03-11 19:25 ` [PATCH v9 01/13] ELF: UAPI and Kconfig additions for ELF program properties Mark Brown
2020-03-11 19:25 ` [PATCH v9 02/13] ELF: Add ELF program property parsing support Mark Brown
2020-03-12 23:59 ` Kees Cook
2020-03-13 11:55 ` Mark Brown
2020-03-11 19:25 ` [PATCH v9 03/13] arm64: Basic Branch Target Identification support Mark Brown
2020-03-11 19:25 ` [PATCH v9 04/13] elf: Allow arch to tweak initial mmap prot flags Mark Brown
2020-03-11 19:26 ` [PATCH v9 05/13] arm64: elf: Enable BTI at exec based on ELF program properties Mark Brown
2020-03-11 19:26 ` [PATCH v9 06/13] arm64: BTI: Decode BYTPE bits when printing PSTATE Mark Brown
2020-03-11 19:26 ` [PATCH v9 07/13] arm64: unify native/compat instruction skipping Mark Brown
2020-03-11 19:26 ` [PATCH v9 08/13] arm64: traps: Shuffle code to eliminate forward declarations Mark Brown
2020-03-14 11:18 ` Catalin Marinas [this message]
2020-03-11 19:26 ` [PATCH v9 09/13] arm64: BTI: Reset BTYPE when skipping emulated instructions Mark Brown
2020-03-11 19:26 ` [PATCH v9 10/13] KVM: " Mark Brown
2020-03-11 19:26 ` [PATCH v9 11/13] arm64: mm: Display guarded pages in ptdump Mark Brown
2020-03-11 19:26 ` [PATCH v9 12/13] mm: smaps: Report arm64 guarded pages in smaps Mark Brown
2020-03-13 0:00 ` Kees Cook
2020-03-11 19:26 ` [PATCH v9 13/13] arm64: BTI: Add Kconfig entry for userspace BTI Mark Brown
2020-03-13 0:01 ` Kees Cook
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=20200314111823.GA21082@mbp \
--to=catalin.marinas@arm.com \
--cc=Dave.Martin@arm.com \
--cc=amit.kachhap@arm.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=drjones@redhat.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kristina.martsenko@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=paul.elliott@arm.com \
--cc=peterz@infradead.org \
--cc=richard.henderson@linaro.org \
--cc=sudi.das@arm.com \
--cc=szabolcs.nagy@arm.com \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=yu-cheng.yu@intel.com \
/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).