Page MenuHomeFreeBSD

vchi: rename bitset macros to avoid collision with bitset(9)
ClosedPublic

Authored by scottph on Aug 24 2020, 11:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Nov 26, 7:01 PM
Unknown Object (File)
Mon, Nov 25, 1:20 AM
Unknown Object (File)
Fri, Nov 22, 11:33 PM
Unknown Object (File)
Fri, Nov 22, 1:29 PM
Unknown Object (File)
Thu, Nov 21, 5:14 PM
Unknown Object (File)
Thu, Nov 21, 4:01 PM
Unknown Object (File)
Thu, Nov 21, 10:08 AM
Unknown Object (File)
Wed, Nov 20, 9:14 PM

Details

Summary

An upcoming change to include bitset(9) macros from vm_page.h
causes a macro name collision with vchi's custom bitset macros.

This change was performed mechanically by:

sed -i .orig s/BITSET/VCHI_BITSET/g $(grep -rl BITSET sys/contrib/vchiq)

MFC after: 1 week
Sponsored by: Ampere Computing, Inc.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

This revision is now accepted and ready to land.Aug 25 2020, 8:44 AM

I wonder if we can upstream this too

I wonder if we can upstream this too

It looks like upstream has moved pretty far in the years since this code was imported. I believe the diff is on the order of:

3702 insertions(+), 7735 deletions(-)

(Where the sys/contrib/vchi has around 14k lines). So I think unless someone plans to feed and water the import, getting the change upstream won't really be of any benefit to us.

I wonder if we can upstream this too

It looks like upstream has moved pretty far in the years since this code was imported. I believe the diff is on the order of:

3702 insertions(+), 7735 deletions(-)

(Where the sys/contrib/vchi has around 14k lines). So I think unless someone plans to feed and water the import, getting the change upstream won't really be of any benefit to us.

Sure. I mean it shouldn't hold up this change in our tree, just that it probably makes sense to do on general principle.