Subject: linux-next: build failure after merge of the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 20 Jun 2023 14:53:57 +1000

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allnoconfig)
failed like this:

In file included from include/linux/mem_encrypt.h:17,
                 from arch/x86/include/asm/page_types.h:7,
                 from arch/x86/include/asm/page.h:9,
                 from arch/x86/include/asm/thread_info.h:12,
                 from include/linux/thread_info.h:60,
                 from arch/x86/include/asm/preempt.h:9,
                 from include/linux/preempt.h:78,
                 from include/linux/spinlock.h:56,
                 from include/linux/swait.h:7,
                 from include/linux/completion.h:12,
                 from include/linux/crypto.h:15,
                 from arch/x86/kernel/asm-offsets.c:9:
arch/x86/include/asm/mem_encrypt.h:23:20: error: static declaration of 'mem_encrypt_init' follows non-static declaration
   23 | static inline void mem_encrypt_init(void) { }
      |                    ^~~~~~~~~~~~~~~~
In file included from include/linux/printk.h:6,
                 from include/linux/kernel.h:30,
                 from arch/x86/include/asm/percpu.h:27,
                 from arch/x86/include/asm/preempt.h:6:
include/linux/init.h:158:6: note: previous declaration of 'mem_encrypt_init' with type 'void(void)'
  158 | void mem_encrypt_init(void);
      |      ^~~~~~~~~~~~~~~~

Caused by commits

  439e17576eb4 ("init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()")
  0a9567ac5e6a ("x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build")

from the tip tree interacting with commit

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

From the mm tree.

I have applied the following merge fix patch for today (but I think it
can be consolidated into the mm tree commit - along with removing the
parts that remove this declaration from elsewhere).

From: Stephen Rothwell <[email-masked]>
Date: Tue, 20 Jun 2023 14:30:52 +1000
Subject: [PATCH] fix up for "init: consolidate prototypes in linux/init.h"

interacting with commits

  439e17576eb4 ("init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()")
  0a9567ac5e6a ("x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build")

from the tip tree.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 include/linux/init.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/linux/init.h b/include/linux/init.h
index 1200fa99e848..266c3e1640d4 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -155,7 +155,6 @@ void __init init_rootfs(void);
 
 void init_IRQ(void);
 void time_init(void);
-void mem_encrypt_init(void);
 void poking_init(void);
 void pgtable_cache_init(void);
 
-- 
2.39.2

-- 
Cheers,
Stephen Rothwell