diff mbox series

linux-next: build failure after merge of the mm tree

Message ID 20230519124311.5167221c@canb.auug.org.au
State New
Headers
Series linux-next: build failure after merge of the mm tree |

Commit Message

Stephen Rothwell May 19, 2023, 2:43 a.m. UTC 
  Hi all,

After merging the mm tree, today's linux-next build (sparc64 defconfig)
failed like this:

arch/sparc/kernel/setup_64.c: In function 'start_early_boot':
arch/sparc/kernel/setup_64.c:382:9: error: implicit declaration of function 'time_init_early'; did you mean 'inode_init_early'? [-Werror=implicit-function-declaration]
  382 |         time_init_early();
      |         ^~~~~~~~~~~~~~~
      |         inode_init_early

Presumably caused by commit

  c16caa9110dd ("init: consolidate prototypes in linux/init.h")

I applied this partial revert:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 May 2023 12:35:26 +1000
Subject: [PATCH] fix up for "init: consolidate prototypes in linux/init.h"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/kernel/kernel.h | 3 +++
 1 file changed, 3 insertions(+)

Comments

Arnd Bergmann May 19, 2023, 8:19 a.m. UTC | #1 
On Fri, May 19, 2023, at 04:43, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mm tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> arch/sparc/kernel/setup_64.c: In function 'start_early_boot':
> arch/sparc/kernel/setup_64.c:382:9: error: implicit declaration of 
> function 'time_init_early'; did you mean 'inode_init_early'? 
> [-Werror=implicit-function-declaration]
>   382 |         time_init_early();
>       |         ^~~~~~~~~~~~~~~
>       |         inode_init_early
>
> Presumably caused by commit
>
>   c16caa9110dd ("init: consolidate prototypes in linux/init.h")
>
> I applied this partial revert:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 19 May 2023 12:35:26 +1000
> Subject: [PATCH] fix up for "init: consolidate prototypes in linux/init.h"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks! It looks like I accidentally dropped this one while looking
for stale 'init_time()' declarations.

    Arnd
diff mbox series

Patch

diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 970ef8dec86e..15da3c0597a5 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -62,6 +62,9 @@  asmlinkage void do_rt_sigreturn32(struct pt_regs *regs);
 void do_signal32(struct pt_regs * regs);
 asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp);
 
+/* time_64.c */
+void __init time_init_early(void);
+
 /* compat_audit.c */
 extern unsigned int sparc32_dir_class[];
 extern unsigned int sparc32_chattr_class[];