diff mbox series

[v2,2/4] riscv: vmlinux-xip.lds.S: remove .alternative section

Message ID 20230523165502.2592-3-jszhang@kernel.org (mailing list archive)
State Changes Requested
Headers show
Series riscv: enable HAVE_LD_DEAD_CODE_DATA_ELIMINATION | expand

Checks

Context Check Description
conchuod/tree_selection fail Failed to apply to next/pending-fixes, riscv/for-next or riscv/master

Commit Message

Jisheng Zhang May 23, 2023, 4:55 p.m. UTC 
ALTERNATIVE mechanism can't work on XIP, and this is also reflected by
below Kconfig dependency:

RISCV_ALTERNATIVE
	...
	depends on !XIP_KERNEL
	...

So there's no .alternative section at all for XIP case, remove it.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
---
 arch/riscv/kernel/vmlinux-xip.lds.S |   6 ------
 1 files changed, 6 deletions(-)

Comments

Guo Ren June 1, 2023, 4:43 a.m. UTC | #1 
Reviewed-by: Guo Ren <guoren@kernel.org>

On Wed, May 24, 2023 at 1:10 AM Jisheng Zhang <jszhang@kernel.org> wrote:
>
> ALTERNATIVE mechanism can't work on XIP, and this is also reflected by
> below Kconfig dependency:
>
> RISCV_ALTERNATIVE
>         ...
>         depends on !XIP_KERNEL
>         ...
>
> So there's no .alternative section at all for XIP case, remove it.
>
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
> ---
>  arch/riscv/kernel/vmlinux-xip.lds.S |   6 ------
>  1 files changed, 6 deletions(-)
>
> diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S
> index eab9edc3b631..50767647fbc6 100644
> --- a/arch/riscv/kernel/vmlinux-xip.lds.S
> +++ b/arch/riscv/kernel/vmlinux-xip.lds.S
> @@ -98,12 +98,6 @@ SECTIONS
>                 __soc_builtin_dtb_table_end = .;
>         }
>
> -       . = ALIGN(8);
> -       .alternative : {
> -               __alt_start = .;
> -               *(.alternative)
> -               __alt_end = .;
> -       }
>         __init_end = .;
>
>         . = ALIGN(16);
> --
> 2.40.1
>
diff mbox series

Patch

diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinux-xip.lds.S
index eab9edc3b631..50767647fbc6 100644
--- a/arch/riscv/kernel/vmlinux-xip.lds.S
+++ b/arch/riscv/kernel/vmlinux-xip.lds.S
@@ -98,12 +98,6 @@  SECTIONS
 		__soc_builtin_dtb_table_end = .;
 	}
 
-	. = ALIGN(8);
-	.alternative : {
-		__alt_start = .;
-		*(.alternative)
-		__alt_end = .;
-	}
 	__init_end = .;
 
 	. = ALIGN(16);