2023-01-13 13:37:33

by Jürgen Groß

Subject: [PATCH] x86/cpu: remove misleading comment

The comment of the "#endif" after setup_disable_pku() is wrong.

As the related #ifdef is only a few lines above, just remove the
comment.

Signed-off-by: Juergen Gross <[email protected]>
---
arch/x86/kernel/cpu/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9cfca3d7d0e2..7670397438c6 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -567,7 +567,7 @@ static __init int setup_disable_pku(char *arg)
return 1;
}
__setup("nopku", setup_disable_pku);
-#endif /* CONFIG_X86_64 */
+#endif

#ifdef CONFIG_X86_KERNEL_IBT

--
2.35.3

2023-01-13 13:57:16

by tip-bot2 for Alexey Makhalov

Subject: [tip: x86/cleanups] x86/cpu: Remove misleading comment

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

Commit-ID: d55dcb7384b1234d3caf70c2f8199c4184502ff9
Gitweb: https://git.kernel.org/tip/d55dcb7384b1234d3caf70c2f8199c4184502ff9
Author: Juergen Gross <[email protected]>
AuthorDate: Fri, 13 Jan 2023 14:01:26 +01:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Fri, 13 Jan 2023 14:20:20 +01:00

x86/cpu: Remove misleading comment

The comment of the "#endif" after setup_disable_pku() is wrong.

As the related #ifdef is only a few lines above, just remove the
comment.

Signed-off-by: Juergen Gross <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/kernel/cpu/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9cfca3d..7670397 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -567,7 +567,7 @@ static __init int setup_disable_pku(char *arg)
return 1;
}
__setup("nopku", setup_disable_pku);
-#endif /* CONFIG_X86_64 */
+#endif

#ifdef CONFIG_X86_KERNEL_IBT