[2.6 patch] process include/linux/if_{addr,link}.h with unifdef

[2.6 patch] process include/linux/if_{addr,link}.h with unifdef

[Adrian Bunk]

After commit d3dcc077bf88806201093f86325ec656e4dbfbce, 
include/linux/if_{addr,link}.h should be processed with unifdef.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 include/linux/Kbuild |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.20-rc4-mm1/include/linux/Kbuild.old	2007-01-20 20:14:02.000000000 +0100
+++ linux-2.6.20-rc4-mm1/include/linux/Kbuild	2007-01-20 20:15:12.000000000 +0100
@@ -70,7 +70,6 @@
 header-y += i2c-dev.h
 header-y += i8k.h
 header-y += icmp.h
-header-y += if_addr.h
 header-y += if_arcnet.h
 header-y += if_arp.h
 header-y += if_bonding.h
@@ -80,7 +79,6 @@
 header-y += if.h
 header-y += if_hippi.h
 header-y += if_infiniband.h
-header-y += if_link.h
 header-y += if_packet.h
 header-y += if_plip.h
 header-y += if_ppp.h
@@ -214,6 +212,7 @@
 unifdef-y += i2c.h
 unifdef-y += i2o-dev.h
 unifdef-y += icmpv6.h
+unifdef-y += if_addr.h
 unifdef-y += if_bridge.h
 unifdef-y += if_ec.h
 unifdef-y += if_eql.h
@@ -221,6 +220,7 @@
 unifdef-y += if_fddi.h
 unifdef-y += if_frad.h
 unifdef-y += if_ltalk.h
+unifdef-y += if_link.h
 unifdef-y += if_pppox.h
 unifdef-y += if_shaper.h
 unifdef-y += if_tr.h

Re: [2.6 patch] process include/linux/if_{addr,link}.h with unifdef

[David Miller]

From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 21 Jan 2007 20:13:19 +0100

> After commit d3dcc077bf88806201093f86325ec656e4dbfbce, 
> include/linux/if_{addr,link}.h should be processed with unifdef.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Applied, thanks Adrian.

I believe at least the 2.6.19 -stable branch will need
this too, right?  Please submit to -stable as needed,
and feel free to add my sign-off:

Signed-off-by: David S. Miller <davem@davemloft.net>

Re: [2.6 patch] process include/linux/if_{addr,link}.h with unifdef

[Adrian Bunk]

On Tue, Jan 23, 2007 at 10:05:17PM -0800, David Miller wrote:
> From: Adrian Bunk <bunk@stusta.de>
> Date: Sun, 21 Jan 2007 20:13:19 +0100
> 
> > After commit d3dcc077bf88806201093f86325ec656e4dbfbce, 
> > include/linux/if_{addr,link}.h should be processed with unifdef.
> > 
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> Applied, thanks Adrian.
> 
> I believe at least the 2.6.19 -stable branch will need
> this too, right?  Please submit to -stable as needed,
> and feel free to add my sign-off:
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>

All my patch does is to remove "#ifndef __KERNEL__"'s around userspace 
#define's from the userspace headers, so it's purely cosmetical.

Except when userspace wrongly defines __KERNEL__, no 
header-y<->unifdef-y should ever have any non-cosmetical effect.

That said, we really want what I called "cosmetical" - not having
"#if{,n}def __KERNEL__" in any userspace headers - it's simply that this 
is not a serious bug.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed