From mboxrd@z Thu Jan  1 00:00:00 1970
From: mark.rutland@arm.com (Mark Rutland)
Date: Mon, 26 Oct 2015 20:26:09 +0000
Subject: [PATCH v2] arm64: Align .text section to PAGE_SIZE
In-Reply-To: <20151026201611.GI12277@leverpostej>
References: <1445882989-10618-1-git-send-email-jeremy.linton@arm.com>
 <20151026201611.GI12277@leverpostej>
Message-ID: <20151026202608.GJ12277@leverpostej>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

> Perhaps it would be better to have something like the following (with
> PAGE_SHIFT sorted out to be includable in a linker script), so any
> ALIGN_DEBUG_RO* correctly aligns things to whatever boundary is
> required, and we don't need to over-align things in the !DEBUG_RO_DATA
> case.

Ignore the bit about PAGE_SHIFT and linker script. I'd got confused as I
had a local typo breaking the build.

With the below diff applied I can boot a defconfig +CONFIG_DEBUG_RODATA
+CONFIG_ARM64_64K_PAGES v4.3-rc7 kernel on Juno

Thanks,
Mark.

> ---->8----
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index 9807333..4d77757 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -60,9 +60,12 @@ PECOFF_FILE_ALIGNMENT = 0x200;
>  #define PECOFF_EDATA_PADDING
>  #endif
>  
> -#ifdef CONFIG_DEBUG_ALIGN_RODATA
> +#if defined(CONFIG_DEBUG_ALIGN_RODATA)
>  #define ALIGN_DEBUG_RO                 . = ALIGN(1<<SECTION_SHIFT);
>  #define ALIGN_DEBUG_RO_MIN(min)                ALIGN_DEBUG_RO
> +#elif defined(CONFIG_DEBUG_RODATA)
> +#define ALIGN_DEBUG_RO                 . = ALIGN(1<<PAGE_SHIFT);
> +#define ALIGN_DEBUG_RO_MIN(min)                ALIGN_DEBUG_RO
>  #else
>  #define ALIGN_DEBUG_RO
>  #define ALIGN_DEBUG_RO_MIN(min)                . = ALIGN(min);