Skip to contentSkip to conversation

ptrace: Remove duplicated include in ptrace.c

PATCH In review Yang Li 3 participants 3 messages Mar 15, 2022 – Mar 16, 2022

Subsystems (2)
lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 ptrace: Remove duplicated include in ptrace.c

Fix following includecheck warning:
./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.

---
 arch/m68k/kernel/ptrace.c | 1 -
 1 file changed, 1 deletion(-)
arch/m68k/kernel/ptrace.c +0 -1
index a0c99fe3118e..6342ff4d2073 100644
@@ -19,7 +19,6 @@
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/signal.h>
-#include <linux/ptrace.h>
 
 #include <linux/uaccess.h>
 #include <asm/page.h>
Signature · 1 line
2.20.1.7.g153144c
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Yang,

CC Eric

Quoted 5 lines · Yang Li

Fix following includecheck warning:
./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.

Thanks for your patch!

arch/m68k/kernel/ptrace.c line 24

Quoted 10 lines
arch/m68k/kernel/ptrace.c +0 -1
@@ -19,7 +19,6 @@
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/signal.h>
-#include <linux/ptrace.h>
 
 #include <linux/uaccess.h>
 #include <asm/page.h>

This is due to commit 153474ba1a4aed0a ("ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h"), which is not yet in the m68k tree, but only in next-20220315, so I cannot do anything about it before v5.18-rc1.

Eric: Can you still fix this in the original commit?

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
Quoted 31 lines · Geert Uytterhoeven

Hi Yang,

CC Eric

Quoted 5 lines · Yang Li

Fix following includecheck warning:
./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.

Thanks for your patch!

arch/m68k/kernel/ptrace.c line 24

Quoted 10 lines
arch/m68k/kernel/ptrace.c +0 -1
@@ -19,7 +19,6 @@
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/signal.h>
-#include <linux/ptrace.h>
 
 #include <linux/uaccess.h>
 #include <asm/page.h>

This is due to commit 153474ba1a4aed0a ("ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h"), which is not yet in the m68k tree, but only in next-20220315, so I cannot do anything about it before v5.18-rc1.

Quoted 1 line

Eric: Can you still fix this in the original commit?

Not unless it is something very serious. Replacing the commit means invalidating testing and review. Which I would rather not do.

In this case I can merge a trivial fix to remove the duplicate. Let me find Lang Li's patch and merge that.

Eric