From mboxrd@z Thu Jan 1 00:00:00 1970 From: lauraa@codeaurora.org (Laura Abbott) Date: Thu, 05 Mar 2015 10:48:11 -0800 Subject: [PATCH 1/2] arm64: fixmap: make FIX_TEXT_POKE0 permanent In-Reply-To: <1425475655-22118-1-git-send-email-mark.rutland@arm.com> References: <1425475655-22118-1-git-send-email-mark.rutland@arm.com> Message-ID: <54F8A4EB.8060109@codeaurora.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 3/4/2015 5:27 AM, Mark Rutland wrote: > The FIX_TEST_POKE0 is currently at the end of the temporary fixmap > slots, despite the fact that it can be used at any point during runtime > (e.g. for poking the text of loaded modules), and thus should be a > permanent fixmap slot (as is the case on arm and x86). > > This patch moves FIX_TEXT_POKE0 into the set of permanent fixmap slots. > > Signed-off-by: Mark Rutland > Cc: Ard Biesheuvel > Cc: Catalin Marinas > Cc: Kees Cook > Cc: Laura Abbott > Cc: Will Deacon > --- Acked-by: Laura Abbott > arch/arm64/include/asm/fixmap.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h > index defa0ff9..9264956 100644 > --- a/arch/arm64/include/asm/fixmap.h > +++ b/arch/arm64/include/asm/fixmap.h > @@ -33,6 +33,7 @@ > enum fixed_addresses { > FIX_HOLE, > FIX_EARLYCON_MEM_BASE, > + FIX_TEXT_POKE0, > __end_of_permanent_fixed_addresses, > > /* > @@ -49,7 +50,6 @@ enum fixed_addresses { > > FIX_BTMAP_END = __end_of_permanent_fixed_addresses, > FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1, > - FIX_TEXT_POKE0, > __end_of_fixed_addresses > }; > > -- Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project This e-mail address will be inactive after March 20, 2015 Please contact privately for follow up after that date.