kern/79266: RELENG_4 pci CONF1_ENABLE_MSK mfc depend

[none]

>Number:         79266
>Category:       kern
>Synopsis:       RELENG_4 pci CONF1_ENABLE_MSK mfc depend
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 26 23:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     none
>Release:        RELENG_4_11_0_RELEASE and newer
>Organization:
none
>Environment:
vanilla 4.10-RELEASE #0 w/smp kernel
>Description:
note: present in both RELENG_4_11_0_RELEASE and RELENG_4 and
possibly other tags newer than RELENG_4_10_0_RELEASE.

from compile logs...
diff -r old/RELENG_4_10_0_RELEASE_GENERIC.md.err new/RELENG_4_11_0_RELEASE_GENERIC.md.err
22a23,28
> In file included from src_RELENG_4_11_0_RELEASE/sys/i386/isa/pci_cfgreg.c:47:
> machine/pci_cfgreg.h:35: warning: `CONF1_ENABLE_MSK' redefined
> src_RELENG_4_11_0_RELEASE/sys/i386/isa/pcibus.h:35: warning: this is the location of the previous definition
> In file included from src_RELENG_4_11_0_RELEASE/sys/i386/isa/pcibus.c:38:
> machine/pci_cfgreg.h:35: warning: `CONF1_ENABLE_MSK' redefined
> src_RELENG_4_11_0_RELEASE/sys/i386/isa/pcibus.h:35: warning: this is the location of the previous definition


from source diff:
note: RELENG_4_10_0_RELEASE is on the left [<].
diff -r i386/include/pci_cfgreg.h src_RELENG_4_11_0_RELEASE/sys/i386/include/pci_cfgreg.h
26c26
<  * $FreeBSD: src/sys/i386/include/pci_cfgreg.h,v 1.4.2.1 2001/07/28 05:55:07 imp Exp $
---
>  * $FreeBSD: src/sys/i386/include/pci_cfgreg.h,v 1.4.2.2 2004/09/22 20:14:46 ps Exp $
35c35
< #define CONF1_ENABLE_MSK   0x7ff00000ul
---
> #define CONF1_ENABLE_MSK   0x7f000000ul

CONF1_ENABLE_MSK is also present in...
 src_RELENG_4_11_0_RELEASE/sys/i386/isa/pcibus.h:#define CONF1_ENABLE_MSK   0x7ff00000ul
and perhaps in RELENG_5/CURRENT

and is thus redefined as above.
which definition is correct?
is the definition in two source files neeeded?
>How-To-Repeat:
- pristine checkout RELENG_4_11_0_RELEASE or RELENG_4
- make buildkernel or config, make depend
- look for the above warnings
- trace back to commit
>Fix:
if the change to the mask as defined in the mfc was correct,
perhaps update the mask in:
 sys/i386/isa/pcibus.h
as well?
>Release-Note:
>Audit-Trail:
>Unformatted: