Module Name: src
Committed By: jdolecek
Date: Sat Aug 1 12:14:40 UTC 2020
Modified Files:
src/sys/arch/amd64/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/x86/include: pci_machdep_common.h
Log Message:
move __HAVE_PCI_MSI_MSIX to <x86/pci_machdep_common.h>
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/include/pci_machdep_common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.68 src/sys/arch/amd64/include/types.h:1.69
--- src/sys/arch/amd64/include/types.h:1.68 Mon May 4 15:55:56 2020
+++ src/sys/arch/amd64/include/types.h Sat Aug 1 12:14:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.68 2020/05/04 15:55:56 jdolecek Exp $ */
+/* $NetBSD: types.h,v 1.69 2020/08/01 12:14:39 jdolecek Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -100,9 +100,6 @@ typedef unsigned char __cpu_simple_lock
#define __HAVE_MM_MD_DIRECT_MAPPED_IO
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_UCAS_FULL
-#if !defined(NO_PCI_MSI_MSIX)
-#define __HAVE_PCI_MSI_MSIX
-#endif
#ifdef _KERNEL_OPT
#define __HAVE_RAS
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.91 src/sys/arch/i386/include/types.h:1.92
--- src/sys/arch/i386/include/types.h:1.91 Mon May 4 15:55:56 2020
+++ src/sys/arch/i386/include/types.h Sat Aug 1 12:14:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.91 2020/05/04 15:55:56 jdolecek Exp $ */
+/* $NetBSD: types.h,v 1.92 2020/08/01 12:14:40 jdolecek Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -133,9 +133,6 @@ typedef __register_t register_t;
#define __HAVE_TLS_VARIANT_II
#define __HAVE_COMMON___TLS_GET_ADDR
#define __HAVE_UCAS_FULL
-#if !defined(NO_PCI_MSI_MSIX)
-#define __HAVE_PCI_MSI_MSIX
-#endif
#define __HAVE_RAS
#endif /* _I386_MACHTYPES_H_ */
Index: src/sys/arch/x86/include/pci_machdep_common.h
diff -u src/sys/arch/x86/include/pci_machdep_common.h:1.24 src/sys/arch/x86/include/pci_machdep_common.h:1.25
--- src/sys/arch/x86/include/pci_machdep_common.h:1.24 Sat Apr 25 15:26:18 2020
+++ src/sys/arch/x86/include/pci_machdep_common.h Sat Aug 1 12:14:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.h,v 1.24 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: pci_machdep_common.h,v 1.25 2020/08/01 12:14:40 jdolecek Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -33,6 +33,10 @@
#ifndef _X86_PCI_MACHDEP_COMMON_H_
#define _X86_PCI_MACHDEP_COMMON_H_
+#if !defined(NO_PCI_MSI_MSIX)
+#define __HAVE_PCI_MSI_MSIX
+#endif
+
/*
* Machine-specific definitions for PCI autoconfiguration.
*/
