[PATCH 1/1] s390: cr: fix unterminated #ifndef

[PATCH 1/1] s390: cr: fix unterminated #ifndef

[Serge E. Hallyn]

With this, v15 compiles and does checkpoint/restart just fine
on s390.

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

diff --git a/arch/s390/include/asm/checkpoint_hdr.h b/arch/s390/include/asm/checkpoint_hdr.h
index 292dc33..48ee296 100644
--- a/arch/s390/include/asm/checkpoint_hdr.h
+++ b/arch/s390/include/asm/checkpoint_hdr.h
@@ -80,4 +80,5 @@ struct ckpt_hdr_header_arch {
 	struct ckpt_hdr h;
 };
 
+#endif /* __s390x__ */
 #endif /* __ASM_S390_CKPT_HDR__H */
-- 
1.6.1

Re: [PATCH 1/1] s390: cr: fix unterminated #ifndef

[Nathan Lynch]

"Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> writes:
> With this, v15 compiles and does checkpoint/restart just fine
> on s390.
>
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  arch/s390/include/asm/checkpoint_hdr.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/s390/include/asm/checkpoint_hdr.h b/arch/s390/include/asm/checkpoint_hdr.h
> index 292dc33..48ee296 100644
> --- a/arch/s390/include/asm/checkpoint_hdr.h
> +++ b/arch/s390/include/asm/checkpoint_hdr.h
> @@ -80,4 +80,5 @@ struct ckpt_hdr_header_arch {
>  	struct ckpt_hdr h;
>  };
>  
> +#endif /* __s390x__ */

I suggest just removing the #ifdef __s390x__.  32-bit builds may not be
supported or tested yet, but just having the declarations isn't going to
break things.  And it's one less thing to stumble over if someone does
implement 32-bit support.

Re: [PATCH 1/1] s390: cr: fix unterminated #ifndef

[Serge E. Hallyn]

Quoting Nathan Lynch (ntl-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org):
> "Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> writes:
> > With this, v15 compiles and does checkpoint/restart just fine
> > on s390.
> >
> > Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> > ---
> >  arch/s390/include/asm/checkpoint_hdr.h |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/s390/include/asm/checkpoint_hdr.h b/arch/s390/include/asm/checkpoint_hdr.h
> > index 292dc33..48ee296 100644
> > --- a/arch/s390/include/asm/checkpoint_hdr.h
> > +++ b/arch/s390/include/asm/checkpoint_hdr.h
> > @@ -80,4 +80,5 @@ struct ckpt_hdr_header_arch {
> >  	struct ckpt_hdr h;
> >  };
> >  
> > +#endif /* __s390x__ */
> 
> I suggest just removing the #ifdef __s390x__.  32-bit builds may not be
> supported or tested yet, but just having the declarations isn't going to
> break things.  And it's one less thing to stumble over if someone does
> implement 32-bit support.

Actually, you're more right than you know - CONFIG_CHECKPOINT already is
off if not 64bit :)

So yeah, the ifdef should just be removed.

thanks,
-serge