[PATCH 1/2] use #error not #warn

[PATCH 1/2] use #error not #warn

[Serge E. Hallyn]

(against -rc7)

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

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

diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
index 790214f..eb5e1b4 100644
--- a/include/linux/checkpoint_hdr.h
+++ b/include/linux/checkpoint_hdr.h
@@ -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__ */
-- 
1.7.0.4

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

[Serge E. Hallyn]

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 net/ipv6/sit.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 7b2c0f0..5ecbe56 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -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)
-- 
1.7.0.4

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

[Serge E. Hallyn]

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 drivers/net/macvlan.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 9a3e24a..360828e 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -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)
-- 
1.6.0.6

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

[Oren Laadan]

Patch 3/2 ???  good bargain :)

Thanks, Serge, will apply all three.

Serge E. Hallyn wrote:
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/net/macvlan.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
> index 9a3e24a..360828e 100644
> --- a/drivers/net/macvlan.c
> +++ b/drivers/net/macvlan.c
> @@ -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)