[Devel] [PATCH] c/r: Fix x86-32 build without CONFIG_CHECKPOINT

[Matt Helsley]

When building for x86-32 the ptregs_checkpoint and ptregs_restart
definitions are missing because they're surrounded by

	arch/x86/built-in.o: In function `sys_call_table':
	(.rodata+0x58c): undefined reference to `ptregs_checkpoint'
	arch/x86/built-in.o: In function `sys_call_table':
	(.rodata+0x590): undefined reference to `ptregs_restart'

The solution is to map these to sys_checkpoint from kernel/sys_ni.c
when CONFIG_CHECKPOINT is not defined.

Signed-off-by: Matt Helsley <matthltc at us.ibm.com>
---
 arch/x86/kernel/entry_32.S |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index af8c81b..07f1d2d 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -784,6 +784,10 @@ PTREGSCALL4(eclone)
 #ifdef CONFIG_CHECKPOINT
 PTREGSCALL4(checkpoint)
 PTREGSCALL4(restart)
+#else
+/* Use the weak defs in kernel/sys_ni.c */
+#define ptregs_checkpoint sys_checkpoint
+#define ptregs_restart sys_restart
 #endif
 
 /* Clone is an oddball.  The 4th arg is in %edi */
-- 
1.6.3.3

_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers