[PATCH 1/2] powerpc/vmlinux.lds: Ensure STRICT_ALIGN_SIZE is at least page aligned

[Christophe Leroy]

Le 16/09/2022 à 15:14, Michael Ellerman a écrit :
> Add a check that STRICT_ALIGN_SIZE is aligned to at least PAGE_SIZE.

This cannot happen, the definitions in arch/powerpc/Kconfig don't allow 
that.

> 
> That then makes the alignment to PAGE_SIZE immediately after the
> alignment to STRICT_ALIGN_SIZE redundant, so remove it.
> 
> Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
> ---
>   arch/powerpc/kernel/vmlinux.lds.S | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
> index fe22d940412f..4e56fc0ee42a 100644
> --- a/arch/powerpc/kernel/vmlinux.lds.S
> +++ b/arch/powerpc/kernel/vmlinux.lds.S
> @@ -32,6 +32,10 @@
>   
>   #define STRICT_ALIGN_SIZE	(1 << CONFIG_DATA_SHIFT)
>   
> +#if STRICT_ALIGN_SIZE < PAGE_SIZE
> +#error "CONFIG_DATA_SHIFT must be >= PAGE_SIZE"

s/PAGE_SIZE/PAGE_SHIFT

> +#endif
> +
>   ENTRY(_stext)
>   
>   PHDRS {
> @@ -215,7 +219,6 @@ SECTIONS
>    */
>   	. = ALIGN(STRICT_ALIGN_SIZE);
>   	__init_begin = .;
> -	. = ALIGN(PAGE_SIZE);
>   	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
>   		_sinittext = .;
>   		INIT_TEXT