[PATCH v2] m68k: amiga: Mark amiga_reset() as __noreturn

[PATCH v2] m68k: amiga: Mark amiga_reset() as __noreturn

[Thorsten Blum]

Mark both the forward declaration and the function definition as
__noreturn, and remove the redundant redeclaration.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
Changes in v2:
- Specify the __noreturn attribute before the function name to avoid a
  compile-time error (Daniel)
- v1: https://lore.kernel.org/r/20260626104142.3782-2-thorsten.blum@linux.dev/
---
 arch/m68k/amiga/config.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 242d18e750b0..7b72d964577a 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -96,7 +96,7 @@ static char amiga_model_name[13] = "Amiga ";
 static void amiga_sched_init(void);
 static void amiga_get_model(char *model);
 static void amiga_get_hardware_list(struct seq_file *m);
-static void amiga_reset(void);
+static void __noreturn amiga_reset(void);
 static void amiga_mem_console_write(struct console *co, const char *b,
 				    unsigned int count);
 #ifdef CONFIG_HEARTBEAT
@@ -543,9 +543,7 @@ static u64 amiga_read_clk(struct clocksource *cs)
 	return ticks;
 }
 
-static void amiga_reset(void)  __noreturn;
-
-static void amiga_reset(void)
+static void __noreturn amiga_reset(void)
 {
 	unsigned long jmp_addr040 = virt_to_phys(&&jmp_addr_label040);
 	unsigned long jmp_addr = virt_to_phys(&&jmp_addr_label);

Re: [PATCH v2] m68k: amiga: Mark amiga_reset() as __noreturn

[Daniel Palmer]

Hi Thorsten,

On Fri, 26 Jun 2026 at 23:58, Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Mark both the forward declaration and the function definition as
> __noreturn, and remove the redundant redeclaration.
<snip>

Boot tested on my A4000, rebooting still works. So FWIW:

Tested-by: Daniel Palmer <daniel@thingy.jp>

Re: [PATCH v2] m68k: amiga: Mark amiga_reset() as __noreturn

[Thorsten Blum]

On Sat, Jun 27, 2026 at 12:07:30AM +0900, Daniel Palmer wrote:
> Hi Thorsten,
> 
> On Fri, 26 Jun 2026 at 23:58, Thorsten Blum <thorsten.blum@linux.dev> wrote:
> >
> > Mark both the forward declaration and the function definition as
> > __noreturn, and remove the redundant redeclaration.
> <snip>
> 
> Boot tested on my A4000, rebooting still works. So FWIW:
> 
> Tested-by: Daniel Palmer <daniel@thingy.jp>

Thank you!