port-alpha/50283: kernel build failure on netbsd-7

[duck%shangtai.net@localhost]

>Number:         50283
>Category:       port-alpha
>Synopsis:       kernel build failure on netbsd-7
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    port-alpha-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 27 11:20:00 +0000 2015
>Originator:     Staffan Thomen
>Release:        NetBSD 6.1.5
>Organization:
>Environment:
System: NetBSD power 6.1.5 NetBSD 6.1.5 (XEN3_DOMU) amd64
Architecture: amd64
Machine: amd64
>Description:
Cross building a netbsd-7 (Sep 27) alpha kernel from my xeon server (xen/amd64)
failed in pci_machdep.c with a couple of warnings for defined-but-not-used
variables.

I guess this is because my alpha does not have a framebuffer.

>How-To-Repeat:
Build a netbsd-7 alpha kernel without a framebuffer defined (I guess)
>Fix:
--- sys/arch/alpha/pci/pci_machdep.c      2015-09-27 12:14:45.000000000 +0000
+++ sys/arch/alpha/pci/pci_machdep.c.orig 2015-09-27 12:13:06.000000000 +0000
@@ -65,8 +65,12 @@
 pci_display_console(bus_space_tag_t iot, bus_space_tag_t memt, pci_chipset_tag_t pc, int bus, int device, int function)
 {
        pcitag_t tag;
-       pcireg_t id, class;
+       pcireg_t id;
+#if NVGA_PCI || NTGA
+       pcireg_t class;
        int match, nmatch;
+#endif
+
        int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
            int, int, int);
 
@@ -75,11 +79,12 @@
        if (id == 0 || id == 0xffffffff)
                panic("pci_display_console: no device at %d/%d/%d",
                    bus, device, function);
+#if NVGA_PCI || NTGA
+       nmatch = match = 0; /* XXX really only if we've got FBs configured */
        class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+#endif
 
-       nmatch = match = 0; /* XXX really only if we've got FBs configured */
        fn = NULL;
-
 #if NVGA_PCI
        nmatch = DEVICE_IS_VGA_PCI(class, id);
        if (nmatch > match) {