Skip to contentSkip to conversation

process include/linux/if_{addr,link}.h with unifdef

PATCH Applied Adrian Bunk 2 participants 3 messages Jan 21, 2007 – Jan 24, 2007

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

PATCH 1/1 process include/linux/if_{addr,link}.h with unifdef

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

---

 include/linux/Kbuild |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/Kbuild renamed from include/linux/Kbuild.old +2 -2
@@ -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
maintainer Applied
#1 lore raw

From: Adrian Bunk <[email protected]>
Date: Sun, 21 Jan 2007 20:13:19 +0100

Quoted 4 lines

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

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:

#2 lore raw
Quoted 8 lines · David Miller

From: Adrian Bunk <[email protected]>
Date: Sun, 21 Jan 2007 20:13:19 +0100

Quoted 4 lines

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

Quoted 7 lines

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:

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

Signature · 4 lines
       "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