m68k: Add forward declaration for show_registers()

[PATCH] m68k: Add forward declaration for show_registers()

Posted by Geert Uytterhoeven 3 years, 9 months ago

There are several forward declarations for show_registers() in C source
files.  Replace these by a single common forward declaration in
<asm/processor.h>, and include <asm/processor.h> where needed.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
To be queued in the m68k tree for v5.20.

 arch/m68k/include/asm/processor.h | 1 +
 arch/m68k/kernel/traps.c          | 1 +
 arch/m68k/mac/macints.c           | 3 +--
 arch/m68k/virt/ints.c             | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index ffeda9aa526a5420..d86b4009880b4e79 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -151,6 +151,7 @@ static inline void release_thread(struct task_struct *dead_task)
 }
 
 unsigned long __get_wchan(struct task_struct *p);
+void show_registers(struct pt_regs *regs);
 
 #define	KSTK_EIP(tsk)	\
     ({			\
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index 59fc63feb0dcce8a..5c8cba0efc63e580 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -36,6 +36,7 @@
 #include <linux/uaccess.h>
 #include <asm/traps.h>
 #include <asm/machdep.h>
+#include <asm/processor.h>
 #include <asm/siginfo.h>
 #include <asm/tlbflush.h>
 
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 883e48230f87a187..5cbaf6e9497c698a 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -126,8 +126,7 @@
 #include <asm/mac_baboon.h>
 #include <asm/hwtest.h>
 #include <asm/irq_regs.h>
-
-extern void show_registers(struct pt_regs *);
+#include <asm/processor.h>
 
 static unsigned int mac_irq_startup(struct irq_data *);
 static void mac_irq_shutdown(struct irq_data *);
diff --git a/arch/m68k/virt/ints.c b/arch/m68k/virt/ints.c
index 95818f901ebe322d..896aa6eb8bcc6f3d 100644
--- a/arch/m68k/virt/ints.c
+++ b/arch/m68k/virt/ints.c
@@ -12,6 +12,7 @@
 #include <asm/hwtest.h>
 #include <asm/irq.h>
 #include <asm/irq_regs.h>
+#include <asm/processor.h>
 #include <asm/virt.h>
 
 #define GFPIC_REG_IRQ_PENDING           0x04
@@ -19,8 +20,6 @@
 #define GFPIC_REG_IRQ_DISABLE           0x0c
 #define GFPIC_REG_IRQ_ENABLE            0x10
 
-extern void show_registers(struct pt_regs *regs);
-
 static struct resource picres[6];
 static const char *picname[6] = {
 	"goldfish_pic.0",
-- 
2.25.1

Re: [PATCH] m68k: Add forward declaration for show_registers()

Posted by Laurent Vivier 3 years, 9 months ago

Le 06/07/2022 à 15:48, Geert Uytterhoeven a écrit :
> There are several forward declarations for show_registers() in C source
> files.  Replace these by a single common forward declaration in
> <asm/processor.h>, and include <asm/processor.h> where needed.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> To be queued in the m68k tree for v5.20.
> 
>   arch/m68k/include/asm/processor.h | 1 +
>   arch/m68k/kernel/traps.c          | 1 +
>   arch/m68k/mac/macints.c           | 3 +--
>   arch/m68k/virt/ints.c             | 3 +--
>   4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
> index ffeda9aa526a5420..d86b4009880b4e79 100644
> --- a/arch/m68k/include/asm/processor.h
> +++ b/arch/m68k/include/asm/processor.h
> @@ -151,6 +151,7 @@ static inline void release_thread(struct task_struct *dead_task)
>   }
>   
>   unsigned long __get_wchan(struct task_struct *p);
> +void show_registers(struct pt_regs *regs);
>   
>   #define	KSTK_EIP(tsk)	\
>       ({			\
> diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
> index 59fc63feb0dcce8a..5c8cba0efc63e580 100644
> --- a/arch/m68k/kernel/traps.c
> +++ b/arch/m68k/kernel/traps.c
> @@ -36,6 +36,7 @@
>   #include <linux/uaccess.h>
>   #include <asm/traps.h>
>   #include <asm/machdep.h>
> +#include <asm/processor.h>
>   #include <asm/siginfo.h>
>   #include <asm/tlbflush.h>
>   
> diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
> index 883e48230f87a187..5cbaf6e9497c698a 100644
> --- a/arch/m68k/mac/macints.c
> +++ b/arch/m68k/mac/macints.c
> @@ -126,8 +126,7 @@
>   #include <asm/mac_baboon.h>
>   #include <asm/hwtest.h>
>   #include <asm/irq_regs.h>
> -
> -extern void show_registers(struct pt_regs *);
> +#include <asm/processor.h>
>   
>   static unsigned int mac_irq_startup(struct irq_data *);
>   static void mac_irq_shutdown(struct irq_data *);
> diff --git a/arch/m68k/virt/ints.c b/arch/m68k/virt/ints.c
> index 95818f901ebe322d..896aa6eb8bcc6f3d 100644
> --- a/arch/m68k/virt/ints.c
> +++ b/arch/m68k/virt/ints.c
> @@ -12,6 +12,7 @@
>   #include <asm/hwtest.h>
>   #include <asm/irq.h>
>   #include <asm/irq_regs.h>
> +#include <asm/processor.h>
>   #include <asm/virt.h>
>   
>   #define GFPIC_REG_IRQ_PENDING           0x04
> @@ -19,8 +20,6 @@
>   #define GFPIC_REG_IRQ_DISABLE           0x0c
>   #define GFPIC_REG_IRQ_ENABLE            0x10
>   
> -extern void show_registers(struct pt_regs *regs);
> -
>   static struct resource picres[6];
>   static const char *picname[6] = {
>   	"goldfish_pic.0",

Reviewed-by: Laurent Vivier <laurent@vivier.eu>