Skip to contentSkip to conversation

use #error not #warn

PATCH In review Serge E. Hallyn 2 participants 4 messages Apr 29, 2010 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 use #error not #warn

(against -rc7)

Sorry my bad, I think i said #warn before, but my compiler doesn't like that.

---
 include/linux/checkpoint_hdr.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/checkpoint_hdr.h +1 -1
index 790214f..eb5e1b4 100644
@@ -18,7 +18,7 @@
 #include <linux/in6.h>
 
 #ifndef CONFIG_CHECKPOINT
-#warn linux/checkpoint_hdr.h included directly (without CONFIG_CHECKPOINT)
+#error linux/checkpoint_hdr.h included directly (without CONFIG_CHECKPOINT)
 #endif
 
 #else /* __KERNEL__ */
Signature · 1 line
1.7.0.4

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

#2 lore raw

PATCH 2/2 net/ipv6/sit.c don't #include checkpoint_hdr.h

---
 net/ipv6/sit.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
net/ipv6/sit.c +0 -1
index 7b2c0f0..5ecbe56 100644
@@ -1085,7 +1085,6 @@ static int ipip6_tunnel_change_mtu(struct net_device *dev, int new_mtu)
 }
 
 #include <linux/checkpoint.h>
-#include <linux/checkpoint_hdr.h>
 
 #ifdef CONFIG_NETNS_CHECKPOINT
 static int ipip6_checkpoint(struct ckpt_ctx *ctx, struct net_device *dev)
Signature · 1 line
1.7.0.4

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

#4 lore raw

[PATCH 3/2] drivers/net/macvlan.c: don't #include checkpoint_hdr.h

---
 drivers/net/macvlan.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/macvlan.c +0 -1
index 9a3e24a..360828e 100644
@@ -456,7 +456,6 @@ static struct net_device_stats *macvlan_dev_get_stats(struct net_device *dev)
 }
 
 #include <linux/checkpoint.h>
-#include <linux/checkpoint_hdr.h>
 
 #ifdef CONFIG_NETNS_CHECKPOINT
 static int macvlan_checkpoint(struct ckpt_ctx *ctx, struct net_device *dev)
Signature · 1 line
1.6.0.6

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

#6 lore raw

Re: [PATCH 3/2] drivers/net/macvlan.c: don't #include checkpoint_hdr.h

Patch 3/2 ??? good bargain :)

Thanks, Serge, will apply all three.

Quoted 17 lines · Serge E. Hallyn
---
 drivers/net/macvlan.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/macvlan.c +0 -1
index 9a3e24a..360828e 100644
@@ -456,7 +456,6 @@ static struct net_device_stats *macvlan_dev_get_stats(struct net_device *dev)
 }
 
 #include <linux/checkpoint.h>
-#include <linux/checkpoint_hdr.h>
 
 #ifdef CONFIG_NETNS_CHECKPOINT
 static int macvlan_checkpoint(struct ckpt_ctx *ctx, struct net_device *dev)