Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.85 retrieving revision 1.86 diff -u -p -r1.85 -r1.86 --- src/sys/arch/x86/pci/pci_machdep.c 2019/05/17 18:34:33 1.85 +++ src/sys/arch/x86/pci/pci_machdep.c 2019/05/24 14:28:48 1.86 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.85 2019/05/17 18:34:33 christos Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.86 2019/05/24 14:28:48 nonaka Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.85 2019/05/17 18:34:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.86 2019/05/24 14:28:48 nonaka Exp $"); #include #include @@ -1117,7 +1117,6 @@ populate_fbinfo(device_t dev, prop_dicti device_t device_pci_register(device_t dev, void *aux) { - static bool found_console = false; device_t parent = device_parent(dev); device_pci_props_register(dev, aux); @@ -1171,7 +1170,7 @@ device_pci_register(device_t dev, void * } } if (parent && device_is_a(parent, "pci") && - found_console == false) { + x86_found_console == false) { struct pci_attach_args *pa = aux; if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY) { @@ -1209,7 +1208,7 @@ device_pci_register(device_t dev, void * vga_posth = vga_post_init(pa->pa_bus, pa->pa_device, pa->pa_function); #endif - found_console = true; + x86_found_console = true; return NULL; } }