2023-06-25 13:14:37

by Yue Haibing

[permalink] [raw]
Subject: [PATCH -next] x86: ia32.h: Remove unused code

Since commit 32974ad4907c ("[IA64] Remove COMPAT_IA32 support")
IA32_STACK_TOP and ia32_setup_arg_pages() is not used anymore.
And commit 675a0813609f ("x86: unify mmap_{32|64}.c") left behind
ia32_pick_mmap_layout() extern declaration.

Signed-off-by: YueHaibing <[email protected]>
---
arch/x86/include/asm/ia32.h | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index fada857f0a1e..68f7eefe63d3 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -57,17 +57,6 @@ struct stat64 {
unsigned long long st_ino;
} __attribute__((packed));

-#define IA32_STACK_TOP IA32_PAGE_OFFSET
-
-#ifdef __KERNEL__
-struct linux_binprm;
-extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
- unsigned long stack_top, int exec_stack);
-struct mm_struct;
-extern void ia32_pick_mmap_layout(struct mm_struct *mm);
-
-#endif
-
#endif /* CONFIG_IA32_EMULATION */

#endif /* _ASM_X86_IA32_H */
--
2.34.1



2023-06-28 13:27:07

by Nikolay Borisov

[permalink] [raw]
Subject: Re: [PATCH -next] x86: ia32.h: Remove unused code



On 25.06.23 г. 15:54 ч., YueHaibing wrote:
> Since commit 32974ad4907c ("[IA64] Remove COMPAT_IA32 support")
> IA32_STACK_TOP and ia32_setup_arg_pages() is not used anymore.
> And commit 675a0813609f ("x86: unify mmap_{32|64}.c") left behind
> ia32_pick_mmap_layout() extern declaration.
>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> arch/x86/include/asm/ia32.h | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
> index fada857f0a1e..68f7eefe63d3 100644
> --- a/arch/x86/include/asm/ia32.h
> +++ b/arch/x86/include/asm/ia32.h
> @@ -57,17 +57,6 @@ struct stat64 {
> unsigned long long st_ino;
> } __attribute__((packed));
>
> -#define IA32_STACK_TOP IA32_PAGE_OFFSET
> -
> -#ifdef __KERNEL__
> -struct linux_binprm;
> -extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
> - unsigned long stack_top, int exec_stack);
> -struct mm_struct;
> -extern void ia32_pick_mmap_layout(struct mm_struct *mm);
> -
> -#endif
> -
> #endif /* CONFIG_IA32_EMULATION */
>
> #endif /* _ASM_X86_IA32_H */


Reviewed-by: Nikolay Borisov <[email protected]>

I've sent very similar patch (minus removal of IA32_STACK_TOP define) on
12.06 -
https://lore.kernel.org/all/[email protected]/

2023-07-14 03:47:45

by Yue Haibing

[permalink] [raw]
Subject: Re: [PATCH -next] x86: ia32.h: Remove unused code

ping...

On 2023/6/25 20:54, YueHaibing wrote:
> Since commit 32974ad4907c ("[IA64] Remove COMPAT_IA32 support")
> IA32_STACK_TOP and ia32_setup_arg_pages() is not used anymore.
> And commit 675a0813609f ("x86: unify mmap_{32|64}.c") left behind
> ia32_pick_mmap_layout() extern declaration.
>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> arch/x86/include/asm/ia32.h | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
> index fada857f0a1e..68f7eefe63d3 100644
> --- a/arch/x86/include/asm/ia32.h
> +++ b/arch/x86/include/asm/ia32.h
> @@ -57,17 +57,6 @@ struct stat64 {
> unsigned long long st_ino;
> } __attribute__((packed));
>
> -#define IA32_STACK_TOP IA32_PAGE_OFFSET
> -
> -#ifdef __KERNEL__
> -struct linux_binprm;
> -extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
> - unsigned long stack_top, int exec_stack);
> -struct mm_struct;
> -extern void ia32_pick_mmap_layout(struct mm_struct *mm);
> -
> -#endif
> -
> #endif /* CONFIG_IA32_EMULATION */
>
> #endif /* _ASM_X86_IA32_H */
>

Subject: [tip: x86/cleanups] x86/32: Remove unused IA32_STACK_TOP and two externs

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 52b2c101b9ce3b954ebbed4c24396ec28f66fcd9
Gitweb: https://git.kernel.org/tip/52b2c101b9ce3b954ebbed4c24396ec28f66fcd9
Author: YueHaibing <[email protected]>
AuthorDate: Sun, 25 Jun 2023 20:54:11 +08:00
Committer: Borislav Petkov (AMD) <[email protected]>
CommitterDate: Tue, 02 Apr 2024 15:01:40 +02:00

x86/32: Remove unused IA32_STACK_TOP and two externs

Since

32974ad4907c ("[IA64] Remove COMPAT_IA32 support")

IA32_STACK_TOP and ia32_setup_arg_pages() are not used anymore.

And

675a0813609f ("x86: unify mmap_{32|64}.c")

left behind ia32_pick_mmap_layout() extern declaration.

Remove them all.

[ bp: Massage commit message. ]

Signed-off-by: YueHaibing <[email protected]>
Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/ia32.h | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index 4212c00..9d69f3f 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -56,17 +56,6 @@ struct stat64 {
unsigned long long st_ino;
} __attribute__((packed));

-#define IA32_STACK_TOP IA32_PAGE_OFFSET
-
-#ifdef __KERNEL__
-struct linux_binprm;
-extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
- unsigned long stack_top, int exec_stack);
-struct mm_struct;
-extern void ia32_pick_mmap_layout(struct mm_struct *mm);
-
-#endif
-
extern bool __ia32_enabled;

static __always_inline bool ia32_enabled(void)