[patch 1/2] kcmp: Make it to depend on CONFIG_KCMP

[Cyrill Gorcunov]

On Tue, Feb 19, 2013 at 10:22:21AM +0100, Michal Marek wrote:
> On 19.2.2013 07:48, Cyrill Gorcunov wrote:
> > --- linux-2.6.git.orig/init/Kconfig
> > +++ linux-2.6.git/init/Kconfig
> > @@ -279,6 +279,15 @@ config FHANDLE
> >  	  get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
> >  	  syscalls.
> >  
> > +config KCMP
> > +	bool "kcmp syscall"
> > +	default n
> 
> Previously, kcmp was enabled with CONFIG_CHECKPOINT_RESTORE. Maybe
> change it to 'default CHECKPOINT_RESTORE', so that make oldconfig does
> the right thing?

Yes, thanks, good point! I've been adviced that make it obj-y by default
may be a good option as well, not sure.
---
From: Cyrill Gorcunov <gorcunov at openvz.org>
Subject: kcmp: Make it to depend on CONFIG_KCMP

Since kcmp syscall has been implemented (initially on
x86 architecture) a number of other archs wire it up
as well: xtensa, sparc, sh, s390, mips, microblaze,
m68k (not taking into account those who uses
<asm-generic/unistd.h> for syscall numbers
definitions).

But the Makefile, which turns kcmp.o generation on
still depends on former config-x86. Thus get rid
of this limitation and make kcmp.o depend on CONFIG_KCMP
option.

v2:
 - As Michal pointed the old configs might already use of
   CHECKPOINT_RESTORE, so make "default" accordingly.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
Cc: KOSAKI Motohiro <kosaki.motohiro at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at parallels.com>
Cc: Andrey Vagin <avagin at openvz.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Glauber Costa <glommer at parallels.com>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Tejun Heo <tj at kernel.org>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Pekka Enberg <penberg at kernel.org>
Cc: Eric Dumazet <eric.dumazet at gmail.com>
Cc: Vasiliy Kulikov <segoon at openwall.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Valdis.Kletnieks at vt.edu
Cc: Michal Marek <mmarek at suse.cz>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
---
 init/Kconfig    |    9 +++++++++
 kernel/Makefile |    4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

Index: linux-2.6.git/init/Kconfig
===================================================================
--- linux-2.6.git.orig/init/Kconfig
+++ linux-2.6.git/init/Kconfig
@@ -279,6 +279,15 @@ config FHANDLE
 	  get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
 	  syscalls.
 
+config KCMP
+	bool "kcmp syscall"
+	default CHECKPOINT_RESTORE
+	help
+	  If you say Y here, a user level program will be able to use
+	  kcmp(2) syscall.
+
+	  If unsure, say N.
+
 config AUDIT
 	bool "Auditing support"
 	depends on NET
Index: linux-2.6.git/kernel/Makefile
===================================================================
--- linux-2.6.git.orig/kernel/Makefile
+++ linux-2.6.git/kernel/Makefile
@@ -25,9 +25,7 @@ endif
 obj-y += sched/
 obj-y += power/
 
-ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
-obj-$(CONFIG_X86) += kcmp.o
-endif
+obj-$(CONFIG_KCMP) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o