[PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h

[PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h

[Serge E. Hallyn]

I dunno...  does this seem worth a shot?  Or should I just go ahead
and #define CKPT_ARCH_NSIG in arch/s390/include/asm/checkpoint_hdr.h
after all?

From c128ce9ebc0bea5801f90ba99a58fcc18b7df84f Mon Sep 17 00:00:00 2001
From: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Date: Fri, 26 Jun 2009 10:59:17 -0400
Subject: [PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h

Just a thought...  if the signal code changes we don't want
the checkpoint code getting out of sync.  But putting it where
it really belongs - asm/sigcontext.h - doesn't work bc that's
under ifdef __KERNEL__.  So does this seem like a reasonable thing
to do?

Also define the value for s390.

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 arch/s390/include/asm/signal.h        |    2 ++
 arch/x86/include/asm/checkpoint_hdr.h |    2 --
 arch/x86/include/asm/signal.h         |    1 +
 include/linux/checkpoint_hdr.h        |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/signal.h b/arch/s390/include/asm/signal.h
index f6cfddb..bcd7afa 100644
--- a/arch/s390/include/asm/signal.h
+++ b/arch/s390/include/asm/signal.h
@@ -38,6 +38,8 @@ typedef unsigned long sigset_t;
 
 #endif /* __KERNEL__ */
 
+#define CKPT_ARCH_NSIG	64
+
 #define SIGHUP           1
 #define SIGINT           2
 #define SIGQUIT          3
diff --git a/arch/x86/include/asm/checkpoint_hdr.h b/arch/x86/include/asm/checkpoint_hdr.h
index 745038b..16485ca 100644
--- a/arch/x86/include/asm/checkpoint_hdr.h
+++ b/arch/x86/include/asm/checkpoint_hdr.h
@@ -44,8 +44,6 @@ enum {
 	CKPT_HDR_MM_CONTEXT_LDT,
 };
 
-#define CKPT_ARCH_NSIG  64
-
 struct ckpt_hdr_header_arch {
 	struct ckpt_hdr h;
 	/* FIXME: add HAVE_HWFP */
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 7761a5d..de9147d 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -40,6 +40,7 @@ typedef unsigned long sigset_t;
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
+#define CKPT_ARCH_NSIG  64
 #define SIGHUP		 1
 #define SIGINT		 2
 #define SIGQUIT		 3
diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
index 37bae3d..7d16664 100644
--- a/include/linux/checkpoint_hdr.h
+++ b/include/linux/checkpoint_hdr.h
@@ -12,6 +12,7 @@
 
 #include <linux/types.h>
 #include <linux/utsname.h>
+#include <asm/signal.h> /* for CKPT_ARCH_NSIG */
 
 /*
  * To maintain compatibility between 32-bit and 64-bit architecture flavors,
-- 
1.6.1

Re: [PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h

[Oren Laadan]

Serge E. Hallyn wrote:
> I dunno...  does this seem worth a shot?  Or should I just go ahead
> and #define CKPT_ARCH_NSIG in arch/s390/include/asm/checkpoint_hdr.h
> after all?

How about leaving definition in checkpoint_hdr.h, and adding
somewhere a compile bug (under __KERNEL__) if there is a
mismatch, i.e. if CKPT_ARCH_NSIG != _NSIG ?

Oren.

> 
> From c128ce9ebc0bea5801f90ba99a58fcc18b7df84f Mon Sep 17 00:00:00 2001
> From: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> Date: Fri, 26 Jun 2009 10:59:17 -0400
> Subject: [PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h
> 
> Just a thought...  if the signal code changes we don't want
> the checkpoint code getting out of sync.  But putting it where
> it really belongs - asm/sigcontext.h - doesn't work bc that's
> under ifdef __KERNEL__.  So does this seem like a reasonable thing
> to do?
> 
> Also define the value for s390.
> 
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  arch/s390/include/asm/signal.h        |    2 ++
>  arch/x86/include/asm/checkpoint_hdr.h |    2 --
>  arch/x86/include/asm/signal.h         |    1 +
>  include/linux/checkpoint_hdr.h        |    1 +
>  4 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/s390/include/asm/signal.h b/arch/s390/include/asm/signal.h
> index f6cfddb..bcd7afa 100644
> --- a/arch/s390/include/asm/signal.h
> +++ b/arch/s390/include/asm/signal.h
> @@ -38,6 +38,8 @@ typedef unsigned long sigset_t;
>  
>  #endif /* __KERNEL__ */
>  
> +#define CKPT_ARCH_NSIG	64
> +
>  #define SIGHUP           1
>  #define SIGINT           2
>  #define SIGQUIT          3
> diff --git a/arch/x86/include/asm/checkpoint_hdr.h b/arch/x86/include/asm/checkpoint_hdr.h
> index 745038b..16485ca 100644
> --- a/arch/x86/include/asm/checkpoint_hdr.h
> +++ b/arch/x86/include/asm/checkpoint_hdr.h
> @@ -44,8 +44,6 @@ enum {
>  	CKPT_HDR_MM_CONTEXT_LDT,
>  };
>  
> -#define CKPT_ARCH_NSIG  64
> -
>  struct ckpt_hdr_header_arch {
>  	struct ckpt_hdr h;
>  	/* FIXME: add HAVE_HWFP */
> diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
> index 7761a5d..de9147d 100644
> --- a/arch/x86/include/asm/signal.h
> +++ b/arch/x86/include/asm/signal.h
> @@ -40,6 +40,7 @@ typedef unsigned long sigset_t;
>  #endif /* __KERNEL__ */
>  #endif /* __ASSEMBLY__ */
>  
> +#define CKPT_ARCH_NSIG  64
>  #define SIGHUP		 1
>  #define SIGINT		 2
>  #define SIGQUIT		 3
> diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
> index 37bae3d..7d16664 100644
> --- a/include/linux/checkpoint_hdr.h
> +++ b/include/linux/checkpoint_hdr.h
> @@ -12,6 +12,7 @@
>  
>  #include <linux/types.h>
>  #include <linux/utsname.h>
> +#include <asm/signal.h> /* for CKPT_ARCH_NSIG */
>  
>  /*
>   * To maintain compatibility between 32-bit and 64-bit architecture flavors,

Re: [PATCH 1/1] cr: move CKPT_ARCH_NSIG to asm/signal.h

[Serge E. Hallyn]

Quoting Oren Laadan (orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org):
> 
> 
> Serge E. Hallyn wrote:
> > I dunno...  does this seem worth a shot?  Or should I just go ahead
> > and #define CKPT_ARCH_NSIG in arch/s390/include/asm/checkpoint_hdr.h
> > after all?
> 
> How about leaving definition in checkpoint_hdr.h, and adding
> somewhere a compile bug (under __KERNEL__) if there is a
> mismatch, i.e. if CKPT_ARCH_NSIG != _NSIG ?

Yeah that sounds better.

thanks,
-serge