From 387a8b5bd54774604fe83f1f00434e1dd3f5872d Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 6 Jan 2022 15:41:53 +0000 Subject: [PATCH] Use a 64-bit integer for pcitag_t and define PCITAG_NODE and PCITAG_OFFSET macros to make kernel build again, same diff as armv7. ok kettenis visa --- sys/arch/octeon/include/pci_machdep.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/arch/octeon/include/pci_machdep.h b/sys/arch/octeon/include/pci_machdep.h index 0a1fd4155c1..8bc31a9053e 100644 --- a/sys/arch/octeon/include/pci_machdep.h +++ b/sys/arch/octeon/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.10 2018/06/18 13:54:03 visa Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.11 2022/01/06 15:41:53 deraadt Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -28,7 +28,11 @@ #include typedef struct mips_pci_chipset *pci_chipset_tag_t; -typedef u_long pcitag_t; + +typedef u_int64_t pcitag_t; +#define PCITAG_NODE(x) ((x) >> 32) +#define PCITAG_OFFSET(x) ((x) & 0xffffffff) + typedef u_long pci_intr_handle_t; struct pci_attach_args; -- 2.20.1