diff mbox series

[v11,1/2] x86/module: remove unused code in __apply_relocate_add

Message ID 20230125185401.279042-1-song@kernel.org (mailing list archive)
State New, archived
Headers show
Series [v11,1/2] x86/module: remove unused code in __apply_relocate_add | expand

Commit Message

Song Liu Jan. 25, 2023, 6:54 p.m. UTC
This "#if 0" block has been untouched for many years. Remove it to clean
up the code.

Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Song Liu <song@kernel.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
---
 arch/x86/kernel/module.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Josh Poimboeuf Jan. 25, 2023, 7:03 p.m. UTC | #1
On Wed, Jan 25, 2023 at 10:54:00AM -0800, Song Liu wrote:
> This "#if 0" block has been untouched for many years. Remove it to clean
> up the code.
> 
> Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Song Liu <song@kernel.org>
> Reviewed-by: Petr Mladek <pmladek@suse.com>

Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Joe Lawrence Jan. 27, 2023, 1:45 p.m. UTC | #2
On Wed, Jan 25, 2023 at 10:54:00AM -0800, Song Liu wrote:
> This "#if 0" block has been untouched for many years. Remove it to clean
> up the code.
> 
> Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Song Liu <song@kernel.org>
> Reviewed-by: Petr Mladek <pmladek@suse.com>
> ---
>  arch/x86/kernel/module.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
> index 705fb2a41d7d..1dee3ad82da2 100644
> --- a/arch/x86/kernel/module.c
> +++ b/arch/x86/kernel/module.c
> @@ -188,10 +188,6 @@ static int __apply_relocate_add(Elf64_Shdr *sechdrs,
>  				goto invalid_relocation;
>  			val -= (u64)loc;
>  			write(loc, &val, 4);
> -#if 0
> -			if ((s64)val != *(s32 *)loc)
> -				goto overflow;
> -#endif
>  			break;
>  		case R_X86_64_PC64:
>  			if (*(u64 *)loc != 0)
> -- 
> 2.30.2
> 

Reviewed-by: Joe Lawrence <joe.lawrence@redhat.com>

--
Joe
Petr Mladek Feb. 3, 2023, 1:33 p.m. UTC | #3
On Wed 2023-01-25 10:54:00, Song Liu wrote:
> This "#if 0" block has been untouched for many years. Remove it to clean
> up the code.
> 
> Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Signed-off-by: Song Liu <song@kernel.org>
> Reviewed-by: Petr Mladek <pmladek@suse.com>

JFYI, I have pushed the patchset into livepatching.git,
branch for-6.3/cleanup-relocations.

It has got quite a lot review and testing. And I consider Josh's ack
to be enough from the x86 maintainers side.

Best Regards,
Petr
diff mbox series

Patch

diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index 705fb2a41d7d..1dee3ad82da2 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -188,10 +188,6 @@  static int __apply_relocate_add(Elf64_Shdr *sechdrs,
 				goto invalid_relocation;
 			val -= (u64)loc;
 			write(loc, &val, 4);
-#if 0
-			if ((s64)val != *(s32 *)loc)
-				goto overflow;
-#endif
 			break;
 		case R_X86_64_PC64:
 			if (*(u64 *)loc != 0)