Skip to contentSkip to conversation

s390: cr: fix unterminated #ifndef

PATCH In review Serge E. Hallyn 2 participants 3 messages May 7, 2009 2 messages not in the archive s390

lore
Share & tools
lore
#0 lore raw

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

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

---
 arch/s390/include/asm/checkpoint_hdr.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/s390/include/asm/checkpoint_hdr.h +1 -0
index 292dc33..48ee296 100644
@@ -80,4 +80,5 @@ struct ckpt_hdr_header_arch {
 	struct ckpt_hdr h;
 };
 
+#endif /* __s390x__ */
 #endif /* __ASM_S390_CKPT_HDR__H */
Signature · 1 line
1.6.1

A message that is not in the archive (sent off-list or not yet received): 20090507203033.GA22542-r/[email protected]

#2 lore raw
Quoted 13 lines · Serge E. Hallyn

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

---
 arch/s390/include/asm/checkpoint_hdr.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/s390/include/asm/checkpoint_hdr.h +0 -0
index 292dc33..48ee296 100644

arch/s390/include/asm/checkpoint_hdr.h struct ckpt_hdr_header_arch { · line 83

Quoted 4 lines
arch/s390/include/asm/checkpoint_hdr.h +1 -0
@@ -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.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 17 lines · Nathan Lynch
Quoted 16 lines · Serge E. Hallyn

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

---
 arch/s390/include/asm/checkpoint_hdr.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/s390/include/asm/checkpoint_hdr.h +0 -0
index 292dc33..48ee296 100644
@@ -80,4 +80,5 @@ struct ckpt_hdr_header_arch {
 	struct ckpt_hdr h;
 };
 
Quoted 6 lines

arch/s390/include/asm/checkpoint_hdr.h struct ckpt_hdr_header_arch { · line 83

Quoted 1 line
arch/s390/include/asm/checkpoint_hdr.h +1 -0
+#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